Changeset 243300 in webkit

Timestamp:

Mar 21, 2019 11:00:43 AM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Sources: the name of the file should not be used as a folder
​https://bugs.webkit.org/show_bug.cgi?id=196064
<rdar://problem/49097710>

Reviewed by Timothy Hatcher.

• UserInterface/Views/GeneralTreeElement.js:

(WI.GeneralTreeElement.prototype.createFoldersAsNeededForSubpath):

• UserInterface/Views/SourcesNavigationSidebarPanel.js:

(WI.SourcesNavigationSidebarPanel.prototype._addResource):
Drive-by: sort resources in each folder by name when grouping by path.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/GeneralTreeElement.js (modified) (1 diff)
• UserInterface/Views/SourcesNavigationSidebarPanel.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-03-21  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Sources: the name of the file should not be used as a folder
+        https://bugs.webkit.org/show_bug.cgi?id=196064
+        <rdar://problem/49097710>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/GeneralTreeElement.js:
+        (WI.GeneralTreeElement.prototype.createFoldersAsNeededForSubpath):
+
+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+        (WI.SourcesNavigationSidebarPanel.prototype._addResource):
+        Drive-by: sort resources in each folder by name when grouping by path.
+
 2019-03-20  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js

@@ -208 +208 @@
 
         for (let component of components) {
+            if (component === components.lastValue)
+                break;
+
             if (currentPath)
                 currentPath += "/";

trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js

@@ -683 +683 @@
             }
 
+            let resourceTreeElement = null;
+            if (resource instanceof WI.CSSStyleSheet)
+                resourceTreeElement = new WI.CSSStyleSheetTreeElement(resource);
+            else
+                resourceTreeElement = new WI.ResourceTreeElement(resource, resource, {allowDirectoryAsName: true, hideOrigin: true});
+
             let subpath = resource.urlComponents.path;
             if (subpath && subpath[0] === "/")
@@ -688 +694 @@
 
             let parent = frameTreeElement.createFoldersAsNeededForSubpath(subpath);
-            if (resource instanceof WI.CSSStyleSheet)
-                parent.appendChild(new WI.CSSStyleSheetTreeElement(resource));
-            else
-                parent.appendChild(new WI.ResourceTreeElement(resource, resource, {allowDirectoryAsName: true, hideOrigin: true}));
+            let index = insertionIndexForObjectInListSortedByFunction(resourceTreeElement, parent.children, this._boundCompareTreeElements);
+            parent.insertChild(resourceTreeElement, index);
         }