Changeset 196362 in webkit

Timestamp:

Feb 9, 2016 10:02:53 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Regression: Web Inspector: Sometimes in Elements panel two elements showed as selected at the same time
​https://bugs.webkit.org/show_bug.cgi?id=149742
<rdar://problem/24492481>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-02-09
Reviewed by Timothy Hatcher.

• UserInterface/Views/DOMTreeElement.js:

(WebInspector.DOMTreeElement.prototype.moveChild):
Since removing and re-adding this tree element may forgot its
entire child tree, re-select the selected child that may have
just been lost in the shuffle.

• UserInterface/Views/TreeOutline.js:

(WebInspector.TreeOutline.prototype._forgetTreeElement):
When forgetting the selected tree element, also deselect the
forgotten tree element so it clears its selected state.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DOMTreeElement.js (modified) (1 diff)
• UserInterface/Views/TreeOutline.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-02-09  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Regression: Web Inspector: Sometimes in Elements panel two elements showed as selected at the same time
+        https://bugs.webkit.org/show_bug.cgi?id=149742
+        <rdar://problem/24492481>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/DOMTreeElement.js:
+        (WebInspector.DOMTreeElement.prototype.moveChild):
+        Since removing and re-adding this tree element may forgot its
+        entire child tree, re-select the selected child that may have
+        just been lost in the shuffle.
+
+        * UserInterface/Views/TreeOutline.js:
+        (WebInspector.TreeOutline.prototype._forgetTreeElement):
+        When forgetting the selected tree element, also deselect the
+        forgotten tree element so it clears its selected state.
+
 2016-02-09  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -333 +333 @@
     moveChild(child, targetIndex)
     {
-        var wasSelected = child.selected;
+        // No move needed if the child is already in the right place.
+        if (this.children[targetIndex] === child)
+            return;
+
+        var originalSelectedChild = this.treeOutline.selectedTreeElement;
+
         this.removeChild(child);
         this.insertChild(child, targetIndex);
-        if (wasSelected)
-            child.select();
+
+        if (originalSelectedChild !== this.treeOutline.selectedTreeElement)
+            originalSelectedChild.select();
     }
 

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

@@ -363 +363 @@
     _forgetTreeElement(element)
     {
-        if (this.selectedTreeElement === element)
+        if (this.selectedTreeElement === element) {
+            element.deselect(true)
             this.selectedTreeElement = null;
+        }
         if (this._knownTreeElements[element.identifier])
             this._knownTreeElements[element.identifier].remove(element, true);