Title: [183816] trunk/Source/WebInspectorUI
- Revision
- 183816
- Author
- [email protected]
- Date
- 2015-05-05 09:59:31 -0700 (Tue, 05 May 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183815 => 183816)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-05 16:37:58 UTC (rev 183815)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-05 16:59:31 UTC (rev 183816)
@@ -1,5 +1,29 @@
2015-05-05 Timothy Hatcher <[email protected]>
+ 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 <[email protected]>
+
Web Inspector: Source/WebInspectorUI/UserInterface/Images/Logs.svg has unknown attribute "fille"
https://bugs.webkit.org/show_bug.cgi?id=144627
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js (183815 => 183816)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-05-05 16:37:58 UTC (rev 183815)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-05-05 16:59:31 UTC (rev 183816)
@@ -81,6 +81,28 @@
if (representedObject instanceof WebInspector.DOMTree)
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,6 +163,10 @@
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)
return true;
if (representedObject instanceof WebInspector.ContentFlow)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (183815 => 183816)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-05-05 16:37:58 UTC (rev 183815)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-05-05 16:59:31 UTC (rev 183816)
@@ -59,6 +59,7 @@
this._lastSelectedNodePathSetting = new WebInspector.Setting("last-selected-node-path", null);
+ this._restoreSelectedNodeIsAllowed = true;
this._numberOfSearchResults = null;
};
@@ -145,6 +146,7 @@
selectAndRevealDOMNode: function(domNode, preventFocusChange)
{
+ this._restoreSelectedNodeIsAllowed = false;
this._domTreeOutline.selectDOMNode(domNode, !preventFocusChange);
},
@@ -322,7 +324,7 @@
_restoreSelectedNodeAfterUpdate: function(documentURL, defaultNode)
{
- if (!WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
+ if (!this._restoreSelectedNodeIsAllowed || !WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
return;
function selectNode(lastSelectedNode)
@@ -345,8 +347,9 @@
function selectLastSelectedNode(nodeId)
{
- if (!WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
+ if (!this._restoreSelectedNodeIsAllowed || !WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
return;
+
selectNode.call(this, WebInspector.domTreeManager.nodeForId(nodeId));
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js (183815 => 183816)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js 2015-05-05 16:37:58 UTC (rev 183815)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js 2015-05-05 16:59:31 UTC (rev 183816)
@@ -56,7 +56,7 @@
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;
},
focusSearchField: function()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
