Changeset 183423 in webkit

Timestamp:

Apr 27, 2015 2:30:58 PM (9 years ago)

Author:

timothy@apple.com

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.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ElementsTabContentView.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-04-27  Timothy Hatcher  <timothy@apple.com>
+
+        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  <timothy@apple.com>
 

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

@@ -35 +35 @@
 
     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();
 };
 
@@ -79 +79 @@
         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();
@@ -91 +92 @@
         if (mainFrame)
             this.contentBrowser.showContentViewForRepresentedObject(mainFrame.domTree);
+    },
+
+    _mainFrameDidChange: function(event)
+    {
+        this._showDOMTreeContentView();
+    },
+
+    _mainResourceDidChange: function(event)
+    {
+        if (!event.target.isMainFrame())
+            return;
+
+        this._showDOMTreeContentView();
     }
 };