Changeset 183816 in webkit

Timestamp:

May 5, 2015, 9:59:31 AM (10 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: Fix some issues with Search tabs
​https://bugs.webkit.org/show_bug.cgi?id=144531

Reviewed by Darin Adler.

• UserInterface/Views/ContentView.js:

(WebInspector.ContentView):
(WebInspector.ContentView.isViewable):
Support DOMSearchMatchObject and SourceCodeSearchMatchObject representedObjects. These are usually
handled at a higher level, but cookie restoring requires ContentView to handle them.

• UserInterface/Views/DOMTreeContentView.js:

(WebInspector.DOMTreeContentView):
(WebInspector.DOMTreeContentView.prototype.selectAndRevealDOMNode):
(WebInspector.DOMTreeContentView.prototype.selectLastSelectedNode):
(WebInspector.DOMTreeContentView.prototype._restoreSelectedNodeAfterUpdate):
Don't allow restoring the previous selected node when another not has already been selected.

• UserInterface/Views/SearchTabContentView.js:

(WebInspector.SearchTabContentView.prototype.canShowRepresentedObject):
Allow Script objects to be shown in the Search tab.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ContentView.js (modified) (2 diffs)
• UserInterface/Views/DOMTreeContentView.js (modified) (4 diffs)
• UserInterface/Views/SearchTabContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-05-05  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Fix some issues with Search tabs
+        https://bugs.webkit.org/show_bug.cgi?id=144531
+
+        Reviewed by Darin Adler.
+
+        * UserInterface/Views/ContentView.js:
+        (WebInspector.ContentView):
+        (WebInspector.ContentView.isViewable):
+        Support DOMSearchMatchObject and SourceCodeSearchMatchObject representedObjects. These are usually
+        handled at a higher level, but cookie restoring requires ContentView to handle them.
+
+        * UserInterface/Views/DOMTreeContentView.js:
+        (WebInspector.DOMTreeContentView):
+        (WebInspector.DOMTreeContentView.prototype.selectAndRevealDOMNode):
+        (WebInspector.DOMTreeContentView.prototype.selectLastSelectedNode):
+        (WebInspector.DOMTreeContentView.prototype._restoreSelectedNodeAfterUpdate):
+        Don't allow restoring the previous selected node when another not has already been selected.
+
+        * UserInterface/Views/SearchTabContentView.js:
+        (WebInspector.SearchTabContentView.prototype.canShowRepresentedObject):
+        Allow Script objects to be shown in the Search tab.
+
 2015-05-05  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -82 +82 @@
             return new WebInspector.FrameDOMTreeContentView(representedObject, extraArguments);
 
+        if (representedObject instanceof WebInspector.DOMSearchMatchObject) {
+            var resultView = new WebInspector.FrameDOMTreeContentView(WebInspector.frameResourceManager.mainFrame.domTree, extraArguments);
+            resultView.restoreFromCookie({nodeToSelect: representedObject.domNode});
+            return resultView;
+        }
+
+        if (representedObject instanceof WebInspector.SourceCodeSearchMatchObject) {
+            var resultView;
+            if (representedObject.sourceCode instanceof WebInspector.Resource)
+                resultView = new WebInspector.ResourceClusterContentView(representedObject.sourceCode, extraArguments);
+            else if (representedObject.sourceCode instanceof WebInspector.Script)
+                resultView = new WebInspector.ScriptContentView(representedObject.sourceCode, extraArguments);
+            else
+                console.error("Unknown SourceCode", representedObject.sourceCode);
+
+            var textRangeToSelect = representedObject.sourceCodeTextRange.formattedTextRange;
+            var startPosition = textRangeToSelect.startPosition();
+            resultView.restoreFromCookie({lineNumber: startPosition.lineNumber, columnNumber: startPosition.columnNumber});
+
+            return resultView;
+        }
+
         if (representedObject instanceof WebInspector.LogObject)
             return new WebInspector.LogContentView(representedObject, extraArguments);
@@ -141 +163 @@
         return true;
     if (representedObject instanceof WebInspector.DOMTree)
+        return true;
+    if (representedObject instanceof WebInspector.DOMSearchMatchObject)
+        return true;
+    if (representedObject instanceof WebInspector.SourceCodeSearchMatchObject)
         return true;
     if (representedObject instanceof WebInspector.LogObject)

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

@@ -60 +60 @@
     this._lastSelectedNodePathSetting = new WebInspector.Setting("last-selected-node-path", null);
 
+    this._restoreSelectedNodeIsAllowed = true;
     this._numberOfSearchResults = null;
 };
@@ -146 +147 @@
     selectAndRevealDOMNode: function(domNode, preventFocusChange)
     {
+        this._restoreSelectedNodeIsAllowed = false;
         this._domTreeOutline.selectDOMNode(domNode, !preventFocusChange);
     },
@@ -323 +325 @@
     _restoreSelectedNodeAfterUpdate: function(documentURL, defaultNode)
     {
-        if (!WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
+        if (!this._restoreSelectedNodeIsAllowed || !WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
             return;
 
@@ -346 +348 @@
         function selectLastSelectedNode(nodeId)
         {
-            if (!WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
-                return;
+            if (!this._restoreSelectedNodeIsAllowed || !WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
+                return;
+
             selectNode.call(this, WebInspector.domTreeManager.nodeForId(nodeId));
         }

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

@@ -57 +57 @@
     canShowRepresentedObject: function(representedObject)
     {
-        return representedObject instanceof WebInspector.Resource || representedObject instanceof WebInspector.DOMTree;
+        return representedObject instanceof WebInspector.Resource || representedObject instanceof WebInspector.Script || representedObject instanceof WebInspector.DOMTree;
     },