Title: [209519] trunk/Source/WebInspectorUI
- Revision
- 209519
- Author
- commit-qu...@webkit.org
- Date
- 2016-12-07 20:27:19 -0800 (Wed, 07 Dec 2016)
Log Message
REGRESSION(r203912): Web Inspector: Navigation sidebar widths are not saved
https://bugs.webkit.org/show_bug.cgi?id=165496
Patch by Devin Rousso <dcrousso+web...@gmail.com> on 2016-12-07
Reviewed by Matt Baker.
* UserInterface/Views/TabBrowser.js:
(WebInspector.TabBrowser):
(WebInspector.TabBrowser.prototype._sidebarWidthDidChange):
(WebInspector.TabBrowser.prototype._showNavigationSidebarPanelForTabContentView):
(WebInspector.TabBrowser.prototype._sidebarWidthDidChange): Renamed from _detailsSidebarWidthDidChange.
Add event listener for when the navigation sidebar's width is changed.
* UserInterface/Views/TabContentView.js:
(WebInspector.TabContentView):
(WebInspector.TabContentView.prototype.get navigationSidebarPanel):
(WebInspector.TabContentView.prototype.get navigationSidebarCollapsedSetting):
(WebInspector.TabContentView.prototype.get navigationSidebarWidthSetting):
(WebInspector.TabContentView.prototype.get detailsSidebarPanels):
(WebInspector.TabContentView.prototype.get detailsSidebarCollapsedSetting):
(WebInspector.TabContentView.prototype.get detailsSidebarSelectedPanelSetting):
(WebInspector.TabContentView.prototype.get detailsSidebarWidthSetting):
Add WebInspector.Setting object for the navigation sidebar's width.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (209518 => 209519)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-08 03:58:39 UTC (rev 209518)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-08 04:27:19 UTC (rev 209519)
@@ -1,3 +1,28 @@
+2016-12-07 Devin Rousso <dcrousso+web...@gmail.com>
+
+ REGRESSION(r203912): Web Inspector: Navigation sidebar widths are not saved
+ https://bugs.webkit.org/show_bug.cgi?id=165496
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Views/TabBrowser.js:
+ (WebInspector.TabBrowser):
+ (WebInspector.TabBrowser.prototype._sidebarWidthDidChange):
+ (WebInspector.TabBrowser.prototype._showNavigationSidebarPanelForTabContentView):
+ (WebInspector.TabBrowser.prototype._sidebarWidthDidChange): Renamed from _detailsSidebarWidthDidChange.
+ Add event listener for when the navigation sidebar's width is changed.
+
+ * UserInterface/Views/TabContentView.js:
+ (WebInspector.TabContentView):
+ (WebInspector.TabContentView.prototype.get navigationSidebarPanel):
+ (WebInspector.TabContentView.prototype.get navigationSidebarCollapsedSetting):
+ (WebInspector.TabContentView.prototype.get navigationSidebarWidthSetting):
+ (WebInspector.TabContentView.prototype.get detailsSidebarPanels):
+ (WebInspector.TabContentView.prototype.get detailsSidebarCollapsedSetting):
+ (WebInspector.TabContentView.prototype.get detailsSidebarSelectedPanelSetting):
+ (WebInspector.TabContentView.prototype.get detailsSidebarWidthSetting):
+ Add WebInspector.Setting object for the navigation sidebar's width.
+
2016-12-07 Nikita Vasilyev <nvasil...@apple.com>
Web Inspector: Control Flow Profiler's event handlers aren't getting removed when ContentView closes
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (209518 => 209519)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2016-12-08 03:58:39 UTC (rev 209518)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2016-12-08 04:27:19 UTC (rev 209519)
@@ -37,13 +37,15 @@
this._navigationSidebar = navigationSidebar || null;
this._detailsSidebar = detailsSidebar || null;
- if (this._navigationSidebar)
+ if (this._navigationSidebar) {
this._navigationSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._sidebarCollapsedStateDidChange, this);
+ this._navigationSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
+ }
if (this._detailsSidebar) {
this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._sidebarCollapsedStateDidChange, this);
this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._sidebarPanelSelected, this);
- this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._detailsSidebarWidthDidChange, this);
+ this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
}
this._contentViewContainer = new WebInspector.ContentViewContainer;
@@ -294,9 +296,9 @@
tabContentView.detailsSidebarCollapsedSetting.value = this._detailsSidebar.collapsed;
}
- _detailsSidebarWidthDidChange(event)
+ _sidebarWidthDidChange(event)
{
- if (this._ignoreSidebarEvents)
+ if (this._ignoreSidebarEvents || !event.data)
return;
let tabContentView = this.selectedTabContentView;
@@ -303,8 +305,15 @@
if (!tabContentView)
return;
- if (event.target === this._detailsSidebar && event.data)
+ switch (event.target) {
+ case this._navigationSidebar:
+ tabContentView.navigationSidebarWidthSetting.value = event.data.newWidth;
+ break;
+
+ case this._detailsSidebar:
tabContentView.detailsSidebarWidthSetting.value = event.data.newWidth;
+ break;
+ }
}
_showNavigationSidebarPanelForTabContentView(tabContentView)
@@ -323,6 +332,9 @@
return;
}
+ if (tabContentView.navigationSidebarWidthSetting.value)
+ this._navigationSidebar.width = tabContentView.navigationSidebarWidthSetting.value;
+
var navigationSidebarPanel = tabContentView.navigationSidebarPanel;
if (!navigationSidebarPanel) {
this._navigationSidebar.collapsed = true;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js (209518 => 209519)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2016-12-08 03:58:39 UTC (rev 209518)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2016-12-08 04:27:19 UTC (rev 209519)
@@ -47,11 +47,14 @@
this._navigationSidebarPanel = navigationSidebarPanel || null;
this._detailsSidebarPanels = detailsSidebarPanels || [];
+ const defaultSidebarWidth = 300;
+
this._navigationSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-collapsed", false);
+ this._navigationSidebarWidthSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-width", defaultSidebarWidth);
this._detailsSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-details-sidebar-collapsed", true);
this._detailsSidebarSelectedPanelSetting = new WebInspector.Setting(identifier + "-details-sidebar-selected-panel", null);
- this._detailsSidebarWidthSetting = new WebInspector.Setting(identifier + "-details-sidebar-width", 0);
+ this._detailsSidebarWidthSetting = new WebInspector.Setting(identifier + "-details-sidebar-width", defaultSidebarWidth);
this._cookieSetting = new WebInspector.Setting(identifier + "-tab-cookie", {});
}
@@ -170,33 +173,12 @@
this._cookieSetting.value = cookie;
}
- get navigationSidebarPanel()
- {
- return this._navigationSidebarPanel;
- }
+ get navigationSidebarPanel() { return this._navigationSidebarPanel; }
+ get navigationSidebarCollapsedSetting() { return this._navigationSidebarCollapsedSetting; }
+ get navigationSidebarWidthSetting() { return this._navigationSidebarWidthSetting; }
- get navigationSidebarCollapsedSetting()
- {
- return this._navigationSidebarCollapsedSetting;
- }
-
- get detailsSidebarWidthSetting()
- {
- return this._detailsSidebarWidthSetting;
- }
-
- get detailsSidebarPanels()
- {
- return this._detailsSidebarPanels;
- }
-
- get detailsSidebarCollapsedSetting()
- {
- return this._detailsSidebarCollapsedSetting;
- }
-
- get detailsSidebarSelectedPanelSetting()
- {
- return this._detailsSidebarSelectedPanelSetting;
- }
+ get detailsSidebarPanels() { return this._detailsSidebarPanels; }
+ get detailsSidebarCollapsedSetting() { return this._detailsSidebarCollapsedSetting; }
+ get detailsSidebarSelectedPanelSetting() { return this._detailsSidebarSelectedPanelSetting; }
+ get detailsSidebarWidthSetting() { return this._detailsSidebarWidthSetting; }
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
