Changeset 51710 in webkit

Timestamp:

Dec 4, 2009 1:03:38 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-04 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Remove suppress highlight when restoring selected node.

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

• inspector/front-end/ElementsPanel.js: (WebInspector.ElementsPanel.prototype.setDocument.selectNode): (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode): (WebInspector.ElementsPanel.prototype.setDocument):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ElementsPanel.js (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-04  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Remove suppress highlight when restoring selected node.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32152
+
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.setDocument.selectNode):
+        (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode):
+        (WebInspector.ElementsPanel.prototype.setDocument):
+
 2009-12-04  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/inspector/front-end/ElementsPanel.js

@@ -206 +206 @@
         this.treeOutline.suppressSelectHighlight = false;
 
-        function selectDefaultNode()
+        function selectNode(candidateFocusNode)
         {
+            if (!candidateFocusNode)
+                candidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
+
+            if (!candidateFocusNode)
+                return;
+
             this.treeOutline.suppressSelectHighlight = true;
-            var candidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
-            if (candidateFocusNode) {
-                this.focusedDOMNode = candidateFocusNode;
-
-                if (this.treeOutline.selectedTreeElement)
-                    this.treeOutline.selectedTreeElement.expand();
-            }
+            this.focusedDOMNode = candidateFocusNode;
+            if (this.treeOutline.selectedTreeElement)
+                this.treeOutline.selectedTreeElement.expand();
+            this.treeOutline.suppressSelectHighlight = false;
         }
 
@@ -221 +224 @@
         {
             var node = nodeId ? WebInspector.domAgent.nodeForId(nodeId) : 0;
-            if (!node) {
-                selectDefaultNode.call(this);
-                return;
-            }
-
-            this.treeOutline.suppressSelectHighlight = true;
-            this.focusedDOMNode = node;
-            this.treeOutline.suppressSelectHighlight = false;
+            selectNode.call(this, node);
         }
 
@@ -234 +230 @@
             InjectedScriptAccess.nodeByPath(this._selectedPathOnReset, selectLastSelectedNode.bind(this));
         else
-            selectDefaultNode.call(this);
+            selectNode.call(this);
         delete this._selectedPathOnReset;
     },