Changeset 101315 in webkit

Timestamp:

Nov 28, 2011, 6:34:38 PM (15 years ago)

Author:

timothy@apple.com

Message:

Add support for knowing when a TreeElement is added or changed anywhere in a TreeOutline.

Reviewed by Brian Weinstein.

• inspector/front-end/treeoutline.js:

(TreeOutline.prototype.appendChild): Call onadd if it exists.
(TreeOutline.prototype.insertChild): Ditto.
(TreeOutline.prototype._treeElementDidChange): Added. Call onchange if it exists.
(TreeElement.prototype.set title): Call didChange.
(TreeElement.prototype.set titleHTML): Ditto.
(TreeElement.prototype.set tooltip): Ditto.
(TreeElement.prototype.set hasChildren): Ditto.
(TreeElement.prototype._fireDidChange): Added. Call TreeOutline._treeElementDidChange.
(TreeElement.prototype.didChange): Added. Schedule a timeout for _fireDidChange.
(TreeElement.prototype.expand): Move the code that sets the expanded flag to the beginning
which is before onpopulate. Since onpopulate can add elements and call onadd, this makes
sure the expanded flag is true before calling those functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/treeoutline.js (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-28  Timothy Hatcher  <timothy@apple.com>
+
+        Add support for knowing when a TreeElement is added or changed anywhere in a TreeOutline.
+
+        Reviewed by Brian Weinstein.
+
+        * inspector/front-end/treeoutline.js:
+        (TreeOutline.prototype.appendChild): Call onadd if it exists.
+        (TreeOutline.prototype.insertChild): Ditto.
+        (TreeOutline.prototype._treeElementDidChange): Added. Call onchange if it exists.
+        (TreeElement.prototype.set title): Call didChange.
+        (TreeElement.prototype.set titleHTML): Ditto.
+        (TreeElement.prototype.set tooltip): Ditto.
+        (TreeElement.prototype.set hasChildren): Ditto.
+        (TreeElement.prototype._fireDidChange): Added. Call TreeOutline._treeElementDidChange.
+        (TreeElement.prototype.didChange): Added. Schedule a timeout for _fireDidChange.
+        (TreeElement.prototype.expand): Move the code that sets the expanded flag to the beginning
+        which is before onpopulate. Since onpopulate can add elements and call onadd, this makes
+        sure the expanded flag is true before calling those functions.
+
 2011-11-28  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/inspector/front-end/treeoutline.js

@@ -93 +93 @@
 
     child._attach();
+
+    if (this.treeOutline.onadd)
+        this.treeOutline.onadd(child);
 }
 
@@ -141 +144 @@
 
     child._attach();
+
+    if (this.treeOutline.onadd)
+        this.treeOutline.onadd(child);
 }
 
@@ -334 +340 @@
 
     return this.getCachedTreeElement(representedObject);
+}
+
+TreeOutline.prototype._treeElementDidChange = function(treeElement)
+{
+    if (treeElement.treeOutline !== this)
+        return;
+
+    if (this.onchange)
+        this.onchange(treeElement);
 }
 
@@ -513 +528 @@
         this._title = x;
         this._setListItemNodeContent();
+        this.didChange();
     },
 
@@ -522 +538 @@
         this._titleHTML = x;
         this._setListItemNodeContent();
+        this.didChange();
     },
 
@@ -532 +549 @@
         if (this._listItemNode)
             this._listItemNode.title = x ? x : "";
+        this.didChange();
     },
 
@@ -553 +571 @@
             this.collapse();
         }
+
+        this.didChange();
     },
 
@@ -586 +606 @@
         if (x && this.expanded)
             this.expand();
+    },
+
+    _fireDidChange: function()
+    {
+        delete this._didChangeTimeoutIdentifier;
+
+        if (this.treeOutline)
+            this.treeOutline._treeElementDidChange(this);
+    },
+
+    didChange: function()
+    {
+        if (!this.treeOutline)
+            return;
+
+        // Prevent telling the TreeOutline multiple times in a row by delaying it with a timeout.
+        if (!this._didChangeTimeoutIdentifier)
+            this._didChangeTimeoutIdentifier = setTimeout(this._fireDidChange.bind(this), 0);
     },
 
@@ -742 +780 @@
         return;
 
+    // Set this before onpopulate. Since onpopulate can add elements and call onadd, this makes
+    // sure the expanded flag is true before calling those functions. This prevents the possibility
+    // of an infinite loop if onpopulate or onadd were to call expand.
+
+    this.expanded = true;
+    if (this.treeOutline)
+        this.treeOutline._treeElementsExpandedState[this.identifier] = true;
+
     if (this.treeOutline && (!this._childrenListNode || this._shouldRefreshChildren)) {
         if (this._childrenListNode && this._childrenListNode.parentNode)
@@ -769 +815 @@
     if (this._childrenListNode)
         this._childrenListNode.classList.add("expanded");
-
-    this.expanded = true;
-    if (this.treeOutline)
-        this.treeOutline._treeElementsExpandedState[this.identifier] = true;
 
     if (this.onexpand)