Changeset 161677 in webkit

Timestamp:

Jan 10, 2014 2:13:07 PM (10 years ago)

Author:

timothy@apple.com

Message:

Clean up some areas of TreeOutline.

​https://bugs.webkit.org/show_bug.cgi?id=123924

Reviewed by Joseph Pecoraro.

• UserInterface/TreeOutline.js:

(TreeOutline.prototype.appendChild): Don't force create _childrenListNode, it will be created
when the tree element is expanded. Only attach if _childrenListNode already exists.
(TreeOutline.prototype.insertChild): Ditto.
(TreeOutline.prototype.getCachedTreeElement): Check the value of treeElementIdentifier
not just the existence of the property. It should never be null/undefined/0, but be safe.
(TreeOutline.prototype.findTreeElement): Null check isAncestor, it isn't required.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/TreeOutline.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-01-10  Timothy Hatcher  <timothy@apple.com>
+
+        Clean up some areas of TreeOutline.
+
+        https://bugs.webkit.org/show_bug.cgi?id=123924
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/TreeOutline.js:
+        (TreeOutline.prototype.appendChild): Don't force create _childrenListNode, it will be created
+        when the tree element is expanded. Only attach if _childrenListNode already exists.
+        (TreeOutline.prototype.insertChild): Ditto.
+        (TreeOutline.prototype.getCachedTreeElement): Check the value of __treeElementIdentifier
+        not just the existence of the property. It should never be null/undefined/0, but be safe.
+        (TreeOutline.prototype.findTreeElement): Null check isAncestor, it isn't required.
+
 2014-01-10  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/TreeOutline.js

@@ -92 +92 @@
         child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
 
-    if (!this._childrenListNode) {
-        this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
-        this._childrenListNode.parentTreeElement = this;
-        this._childrenListNode.classList.add("children");
-        if (this.hidden)
-            this._childrenListNode.classList.add("hidden");
-    }
-
-    child._attach();
+    if (this._childrenListNode)
+        child._attach();
 
     if (this.treeOutline.onadd)
@@ -148 +141 @@
         child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
 
-    if (!this._childrenListNode) {
-        this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
-        this._childrenListNode.parentTreeElement = this;
-        this._childrenListNode.classList.add("children");
-        if (this.hidden)
-            this._childrenListNode.classList.add("hidden");
-    }
-
-    child._attach();
+    if (this._childrenListNode)
+        child._attach();
 
     if (this.treeOutline.onadd)
@@ -294 +280 @@
         return null;
 
-    if ("__treeElementIdentifier" in representedObject) {
+    if (representedObject.__treeElementIdentifier) {
         // If this representedObject has a tree element identifier, and it is a known TreeElement
         // in our tree we can just return that tree element.
@@ -322 +308 @@
     for (var i = 0; i < this.children.length; ++i) {
         item = this.children[i];
-        if (item.representedObject === representedObject || isAncestor(item.representedObject, representedObject)) {
+        if (item.representedObject === representedObject || (isAncestor && isAncestor(item.representedObject, representedObject))) {
             found = true;
             break;