<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209519] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209519">209519</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-07 20:27:19 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/203912">r203912</a>): Web Inspector: Navigation sidebar widths are not saved
https://bugs.webkit.org/show_bug.cgi?id=165496
Patch by Devin Rousso <dcrousso+webkit@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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (209518 => 209519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-12-07 Devin Rousso <dcrousso+webkit@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.
+
</ins><span class="cx"> 2016-12-07 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Control Flow Profiler's event handlers aren't getting removed when ContentView closes
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (209518 => 209519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,13 +37,15 @@
</span><span class="cx"> this._navigationSidebar = navigationSidebar || null;
</span><span class="cx"> this._detailsSidebar = detailsSidebar || null;
</span><span class="cx">
</span><del>- if (this._navigationSidebar)
</del><ins>+ if (this._navigationSidebar) {
</ins><span class="cx"> this._navigationSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._sidebarCollapsedStateDidChange, this);
</span><ins>+ this._navigationSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
+ }
</ins><span class="cx">
</span><span class="cx"> if (this._detailsSidebar) {
</span><span class="cx"> this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._sidebarCollapsedStateDidChange, this);
</span><span class="cx"> this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._sidebarPanelSelected, this);
</span><del>- this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._detailsSidebarWidthDidChange, this);
</del><ins>+ this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._contentViewContainer = new WebInspector.ContentViewContainer;
</span><span class="lines">@@ -294,9 +296,9 @@
</span><span class="cx"> tabContentView.detailsSidebarCollapsedSetting.value = this._detailsSidebar.collapsed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _detailsSidebarWidthDidChange(event)
</del><ins>+ _sidebarWidthDidChange(event)
</ins><span class="cx"> {
</span><del>- if (this._ignoreSidebarEvents)
</del><ins>+ if (this._ignoreSidebarEvents || !event.data)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> let tabContentView = this.selectedTabContentView;
</span><span class="lines">@@ -303,8 +305,15 @@
</span><span class="cx"> if (!tabContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (event.target === this._detailsSidebar && event.data)
</del><ins>+ switch (event.target) {
+ case this._navigationSidebar:
+ tabContentView.navigationSidebarWidthSetting.value = event.data.newWidth;
+ break;
+
+ case this._detailsSidebar:
</ins><span class="cx"> tabContentView.detailsSidebarWidthSetting.value = event.data.newWidth;
</span><ins>+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _showNavigationSidebarPanelForTabContentView(tabContentView)
</span><span class="lines">@@ -323,6 +332,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (tabContentView.navigationSidebarWidthSetting.value)
+ this._navigationSidebar.width = tabContentView.navigationSidebarWidthSetting.value;
+
</ins><span class="cx"> var navigationSidebarPanel = tabContentView.navigationSidebarPanel;
</span><span class="cx"> if (!navigationSidebarPanel) {
</span><span class="cx"> this._navigationSidebar.collapsed = true;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js (209518 => 209519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,11 +47,14 @@
</span><span class="cx"> this._navigationSidebarPanel = navigationSidebarPanel || null;
</span><span class="cx"> this._detailsSidebarPanels = detailsSidebarPanels || [];
</span><span class="cx">
</span><ins>+ const defaultSidebarWidth = 300;
+
</ins><span class="cx"> this._navigationSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-collapsed", false);
</span><ins>+ this._navigationSidebarWidthSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-width", defaultSidebarWidth);
</ins><span class="cx">
</span><span class="cx"> this._detailsSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-details-sidebar-collapsed", true);
</span><span class="cx"> this._detailsSidebarSelectedPanelSetting = new WebInspector.Setting(identifier + "-details-sidebar-selected-panel", null);
</span><del>- this._detailsSidebarWidthSetting = new WebInspector.Setting(identifier + "-details-sidebar-width", 0);
</del><ins>+ this._detailsSidebarWidthSetting = new WebInspector.Setting(identifier + "-details-sidebar-width", defaultSidebarWidth);
</ins><span class="cx">
</span><span class="cx"> this._cookieSetting = new WebInspector.Setting(identifier + "-tab-cookie", {});
</span><span class="cx"> }
</span><span class="lines">@@ -170,33 +173,12 @@
</span><span class="cx"> this._cookieSetting.value = cookie;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get navigationSidebarPanel()
- {
- return this._navigationSidebarPanel;
- }
</del><ins>+ get navigationSidebarPanel() { return this._navigationSidebarPanel; }
+ get navigationSidebarCollapsedSetting() { return this._navigationSidebarCollapsedSetting; }
+ get navigationSidebarWidthSetting() { return this._navigationSidebarWidthSetting; }
</ins><span class="cx">
</span><del>- 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;
- }
</del><ins>+ get detailsSidebarPanels() { return this._detailsSidebarPanels; }
+ get detailsSidebarCollapsedSetting() { return this._detailsSidebarCollapsedSetting; }
+ get detailsSidebarSelectedPanelSetting() { return this._detailsSidebarSelectedPanelSetting; }
+ get detailsSidebarWidthSetting() { return this._detailsSidebarWidthSetting; }
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>