Title: [183423] trunk/Source/WebInspectorUI
- Revision
- 183423
- Author
- [email protected]
- Date
- 2015-04-27 14:30:58 -0700 (Mon, 27 Apr 2015)
Log Message
Web Inspector: Elements tab details sidebar becomes non-expandable after using Console tab
https://bugs.webkit.org/show_bug.cgi?id=144212
Show the DOM tree content view again on main resource change. This better matches what we did
in the pre tab user interface with the DOM being off the main resource tree element.
Reviewed by Joseph Pecoraro.
* UserInterface/Views/ElementsTabContentView.js:
(WebInspector.ElementsTabContentView): Listen for main resource change. Call _showDOMTreeContentView.
(WebInspector.ElementsTabContentView.prototype.closed): Fix a leak and exception.
The removeEventListener was wrong. Add a new removeEventListener for WebInspector.Frame.
(WebInspector.ElementsTabContentView.prototype._showDOMTreeContentView): Added.
(WebInspector.ElementsTabContentView.prototype._mainFrameDidChange): Call _showDOMTreeContentView.
(WebInspector.ElementsTabContentView.prototype._mainResourceDidChange): Added.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183422 => 183423)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-27 21:28:57 UTC (rev 183422)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-27 21:30:58 UTC (rev 183423)
@@ -1,5 +1,23 @@
2015-04-27 Timothy Hatcher <[email protected]>
+ Web Inspector: Elements tab details sidebar becomes non-expandable after using Console tab
+ https://bugs.webkit.org/show_bug.cgi?id=144212
+
+ Show the DOM tree content view again on main resource change. This better matches what we did
+ in the pre tab user interface with the DOM being off the main resource tree element.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ElementsTabContentView.js:
+ (WebInspector.ElementsTabContentView): Listen for main resource change. Call _showDOMTreeContentView.
+ (WebInspector.ElementsTabContentView.prototype.closed): Fix a leak and exception.
+ The removeEventListener was wrong. Add a new removeEventListener for WebInspector.Frame.
+ (WebInspector.ElementsTabContentView.prototype._showDOMTreeContentView): Added.
+ (WebInspector.ElementsTabContentView.prototype._mainFrameDidChange): Call _showDOMTreeContentView.
+ (WebInspector.ElementsTabContentView.prototype._mainResourceDidChange): Added.
+
+2015-04-27 Timothy Hatcher <[email protected]>
+
Web Inspector: TabContentView closed() isn't being called when a tab is closed / removed
https://bugs.webkit.org/show_bug.cgi?id=144229
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js (183422 => 183423)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js 2015-04-27 21:28:57 UTC (rev 183422)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js 2015-04-27 21:30:58 UTC (rev 183423)
@@ -34,9 +34,9 @@
WebInspector.ContentBrowserTabContentView.call(this, identifier || "elements", "elements", tabBarItem, null, detailsSidebarPanels, true);
WebInspector.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
- if (WebInspector.frameResourceManager.mainFrame)
- this.contentBrowser.showContentViewForRepresentedObject(WebInspector.frameResourceManager.mainFrame.domTree);
+ this._showDOMTreeContentView();
};
WebInspector.ElementsTabContentView.prototype = {
@@ -78,18 +78,32 @@
{
WebInspector.ContentBrowserTabContentView.prototype.closed.call(this);
- WebInspector.removeResourceManager.addEventListener(null, null, this);
+ WebInspector.frameResourceManager.removeEventListener(null, null, this);
+ WebInspector.Frame.removeEventListener(null, null, this);
},
// Private
- _mainFrameDidChange: function(event)
+ _showDOMTreeContentView: function()
{
this.contentBrowser.contentViewContainer.closeAllContentViews();
var mainFrame = WebInspector.frameResourceManager.mainFrame;
if (mainFrame)
this.contentBrowser.showContentViewForRepresentedObject(mainFrame.domTree);
+ },
+
+ _mainFrameDidChange: function(event)
+ {
+ this._showDOMTreeContentView();
+ },
+
+ _mainResourceDidChange: function(event)
+ {
+ if (!event.target.isMainFrame())
+ return;
+
+ this._showDOMTreeContentView();
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
