Changeset 21006 in webkit

Timestamp:

Apr 22, 2007, 3:05:48 PM (18 years ago)

Author:

thatcher

Message:

Reviewed by Mitz.

Bug 13437: Inspector does not update when navigating to a different page
​http://bugs.webkit.org/show_bug.cgi?id=13437

• WebInspector/webInspector/inspector.js: Correctly update to a new root node if the new focus node and the old focus node don't have a common ancestor.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebInspector/webInspector/inspector.js (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-04-22  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mitz.
+
+        Bug 13437: Inspector does not update when navigating to a different page
+        http://bugs.webkit.org/show_bug.cgi?id=13437
+
+        * WebInspector/webInspector/inspector.js: Correctly update to a new root node
+          if the new focus node and the old focus node don't have a common ancestor.
+
 2007-04-22  Darin Adler  <darin@apple.com>
 

trunk/WebKit/WebInspector/webInspector/inspector.js

@@ -535 +535 @@
 {
     if (!node || !focusedDOMNode || focusedDOMNode !== node) {
+        var oldFocusNode = focusedDOMNode;
         focusedDOMNode = node;
 
@@ -540 +541 @@
 
         if (focusedDOMNode) {
-            if (!rootDOMNode === node && !isAncestorNode.call(rootDOMNode, node))
-                updateRootNode(firstCommonNodeAncestor.call(focusedDOMNode, node));
+            if (rootDOMNode !== focusedDOMNode && !isAncestorNode.call(rootDOMNode, focusedDOMNode)) {
+                var newRoot = firstCommonNodeAncestor.call(oldFocusNode, focusedDOMNode);
+                if (!newRoot && focusedDOMNode.parentNode)
+                    newRoot = focusedDOMNode.parentNode;
+                else if(!newRoot)
+                    newRoot = focusedDOMNode;
+                updateRootNode(newRoot);
+            }
 
             var item = treeOutline.findTreeElement(focusedDOMNode);