Title: [158397] branches/safari-537.73-branch/Source/WebInspectorUI
- Revision
- 158397
- Author
- [email protected]
- Date
- 2013-10-31 14:50:04 -0700 (Thu, 31 Oct 2013)
Log Message
Merged r156481. <rdar://problem/15168249>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog (158396 => 158397)
--- branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-10-31 21:50:01 UTC (rev 158396)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-10-31 21:50:04 UTC (rev 158397)
@@ -1,5 +1,22 @@
2013-10-31 Lucas Forschler <[email protected]>
+ Merge r156481
+
+ 2013-09-26 Antoine Quint <[email protected]>
+
+ Web Inspector: Keep DOM tree expanded on page reload
+ https://bugs.webkit.org/show_bug.cgi?id=121665
+
+ Reviewed by Darin Adler.
+
+ Allow the node that was selected before reloading the page to be selected
+ at the page is reloaded. Credit goes to Joseph Pecoraro for the fix.
+
+ * UserInterface/DOMTreeContentView.js:
+ (WebInspector.DOMTreeContentView.prototype._rootDOMNodeAvailable.selectNode):
+
+2013-10-31 Lucas Forschler <[email protected]>
+
Merge r154897
2013-08-29 Timothy Hatcher <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/DOMTreeContentView.js (158396 => 158397)
--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/DOMTreeContentView.js 2013-10-31 21:50:01 UTC (rev 158396)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/DOMTreeContentView.js 2013-10-31 21:50:04 UTC (rev 158397)
@@ -282,10 +282,6 @@
function selectNode(lastSelectedNode)
{
- // A selection was made while waiting for the async reply. Just bail now.
- if (this._domTreeOutline.selectedTreeElement)
- return;
-
var nodeToFocus = lastSelectedNode;
if (!nodeToFocus)
nodeToFocus = rootDOMNode.body || rootDOMNode.documentElement;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes