Changeset 218983 in webkit

Timestamp:

Jun 29, 2017 7:16:05 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Remove unnecessary hasChildren from TreeOutline
​https://bugs.webkit.org/show_bug.cgi?id=173986

Reviewed by Joseph Pecoraro.

• UserInterface/Views/TreeOutline.js:

(WebInspector.TreeOutline):
(WebInspector.TreeOutline.prototype.appendChild):
(WebInspector.TreeOutline.prototype.insertChild):
(WebInspector.TreeOutline.prototype.removeChildAtIndex):
(WebInspector.TreeOutline.prototype.removeChild):
(WebInspector.TreeOutline.prototype.get selectedTreeElementIndex):

• UserInterface/Views/NavigationSidebarPanel.js:

(WebInspector.NavigationSidebarPanel.prototype._checkOutlinesForPendingViewStateCookie):

• UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.js:

(WebInspector.VisualStyleCommaSeparatedKeywordEditor.prototype.get value):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/NavigationSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/TreeOutline.js (modified) (6 diffs)
• UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-06-29  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Remove unnecessary hasChildren from TreeOutline
+        https://bugs.webkit.org/show_bug.cgi?id=173986
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/TreeOutline.js:
+        (WebInspector.TreeOutline):
+        (WebInspector.TreeOutline.prototype.appendChild):
+        (WebInspector.TreeOutline.prototype.insertChild):
+        (WebInspector.TreeOutline.prototype.removeChildAtIndex):
+        (WebInspector.TreeOutline.prototype.removeChild):
+        (WebInspector.TreeOutline.prototype.get selectedTreeElementIndex):
+
+        * UserInterface/Views/NavigationSidebarPanel.js:
+        (WebInspector.NavigationSidebarPanel.prototype._checkOutlinesForPendingViewStateCookie):
+        * UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.js:
+        (WebInspector.VisualStyleCommaSeparatedKeywordEditor.prototype.get value):
+
 2017-06-29  Devin Rousso  <drousso@apple.com>
 

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

@@ -646 +646 @@
         var visibleTreeElements = [];
         this.contentTreeOutlines.forEach(function(outline) {
-            var currentTreeElement = outline.hasChildren ? outline.children[0] : null;
+            var currentTreeElement = outline.children.length ? outline.children[0] : null;
             while (currentTreeElement) {
                 visibleTreeElements.push(currentTreeElement);

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

@@ -45 +45 @@
         this.allowsRepeatSelection = false;
         this.root = true;
-        this.hasChildren = false;
         this.expanded = true;
         this.selected = false;
@@ -157 +156 @@
 
         this.children.push(child);
-        this.hasChildren = true;
         child.parent = this;
         child.treeOutline = this.treeOutline;
@@ -207 +205 @@
 
         this.children.splice(index, 0, child);
-        this.hasChildren = true;
         child.parent = this;
         child.treeOutline = this.treeOutline;
@@ -268 +265 @@
         child.previousSibling = null;
 
+        if (!this.children.length && this._listItemNode)
+            this._listItemNode.classList.remove("parent");
+
         if (treeOutline)
             treeOutline.dispatchEventToListeners(WebInspector.TreeOutline.Event.ElementRemoved, {element: child});
@@ -284 +284 @@
 
         this.removeChildAtIndex(childIndex, suppressOnDeselect, suppressSelectSibling);
-
-        if (!this.children.length) {
-            if (this._listItemNode)
-                this._listItemNode.classList.remove("parent");
-            this.hasChildren = false;
-        }
     }
 
@@ -623 +617 @@
     get selectedTreeElementIndex()
     {
-        if (!this.hasChildren || !this.selectedTreeElement)
+        if (!this.children.length || !this.selectedTreeElement)
             return;
 

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

@@ -69 +69 @@
     get value()
     {
-        if (!this._commaSeparatedKeywords.hasChildren)
+        if (!this._commaSeparatedKeywords.children.length)
             return "";