<!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>[215047] 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/215047">215047</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2017-04-06 11:50:05 -0700 (Thu, 06 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Reorder Debugger tab sidebar panels: Scope Chain, Resource, Probes
https://bugs.webkit.org/show_bug.cgi?id=170418
<rdar://problem/31410771>
Reviewed by Timothy Hatcher.
Maintain the sidebar panel order defined by TabContentView when adding
and removing panels.
* UserInterface/Views/ContentBrowserTabContentView.js:
(WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels):
Insert sidebar panel based on the panel order defined by TabContentView.
* UserInterface/Views/DebuggerTabContentView.js:
(WebInspector.DebuggerTabContentView):
* UserInterface/Views/Sidebar.js:
(WebInspector.Sidebar.prototype.addSidebarPanel):
Implemented as an insert at the end.
(WebInspector.Sidebar.prototype.insertSidebarPanel):
Allow inserting into the sidebar panel collection.
(WebInspector.Sidebar.prototype.removeSidebarPanel):
Remove unused return value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSidebarjs">trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (215046 => 215047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-04-06 18:48:11 UTC (rev 215046)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-04-06 18:50:05 UTC (rev 215047)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-04-06 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Reorder Debugger tab sidebar panels: Scope Chain, Resource, Probes
+ https://bugs.webkit.org/show_bug.cgi?id=170418
+ <rdar://problem/31410771>
+
+ Reviewed by Timothy Hatcher.
+
+ Maintain the sidebar panel order defined by TabContentView when adding
+ and removing panels.
+
+ * UserInterface/Views/ContentBrowserTabContentView.js:
+ (WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels):
+ Insert sidebar panel based on the panel order defined by TabContentView.
+
+ * UserInterface/Views/DebuggerTabContentView.js:
+ (WebInspector.DebuggerTabContentView):
+
+ * UserInterface/Views/Sidebar.js:
+ (WebInspector.Sidebar.prototype.addSidebarPanel):
+ Implemented as an insert at the end.
+ (WebInspector.Sidebar.prototype.insertSidebarPanel):
+ Allow inserting into the sidebar panel collection.
+ (WebInspector.Sidebar.prototype.removeSidebarPanel):
+ Remove unused return value.
+
</ins><span class="cx"> 2017-04-05 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Probe values not showing in sidebar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (215046 => 215047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2017-04-06 18:48:11 UTC (rev 215046)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2017-04-06 18:50:05 UTC (rev 215047)
</span><span class="lines">@@ -142,6 +142,8 @@
</span><span class="cx"> this._ignoreDetailsSidebarPanelSelectedEvent = true;
</span><span class="cx"> this._ignoreDetailsSidebarPanelCollapsedEvent = true;
</span><span class="cx">
</span><ins>+ let hiddenSidebarPanels = 0;
+
</ins><span class="cx"> for (var i = 0; i < this.detailsSidebarPanels.length; ++i) {
</span><span class="cx"> var sidebarPanel = this.detailsSidebarPanels[i];
</span><span class="cx"> if (sidebarPanel.inspect(currentRepresentedObjects)) {
</span><span class="lines">@@ -151,7 +153,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The sidebar panel was not previously showing, so add the panel.
</span><del>- WebInspector.detailsSidebar.addSidebarPanel(sidebarPanel);
</del><ins>+ let index = i - hiddenSidebarPanels;
+ WebInspector.detailsSidebar.insertSidebarPanel(sidebarPanel, index);
</ins><span class="cx">
</span><span class="cx"> if (this._lastSelectedDetailsSidebarPanelSetting.value === sidebarPanel.identifier) {
</span><span class="cx"> // Restore the sidebar panel selection if this sidebar panel was the last one selected by the user.
</span><span class="lines">@@ -160,6 +163,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // The sidebar panel can't inspect the current represented objects, so remove the panel and hide the toolbar item.
</span><span class="cx"> WebInspector.detailsSidebar.removeSidebarPanel(sidebarPanel);
</span><ins>+ hiddenSidebarPanels++;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js (215046 => 215047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2017-04-06 18:48:11 UTC (rev 215046)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2017-04-06 18:50:05 UTC (rev 215047)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> {
</span><span class="cx"> let {image, title} = WebInspector.DebuggerTabContentView.tabInfo();
</span><span class="cx"> let tabBarItem = new WebInspector.GeneralTabBarItem(image, title);
</span><del>- let detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.scopeChainDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</del><ins>+ let detailsSidebarPanels = [WebInspector.scopeChainDetailsSidebarPanel, WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</ins><span class="cx">
</span><span class="cx"> super(identifier || "debugger", "debugger", tabBarItem, WebInspector.DebuggerSidebarPanel, detailsSidebarPanels);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSidebarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js (215046 => 215047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2017-04-06 18:48:11 UTC (rev 215046)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2017-04-06 18:50:05 UTC (rev 215047)
</span><span class="lines">@@ -62,25 +62,31 @@
</span><span class="cx">
</span><span class="cx"> addSidebarPanel(sidebarPanel)
</span><span class="cx"> {
</span><ins>+ this.insertSidebarPanel(sidebarPanel, this._sidebarPanels.length);
+ }
+
+ insertSidebarPanel(sidebarPanel, index)
+ {
</ins><span class="cx"> console.assert(sidebarPanel instanceof WebInspector.SidebarPanel);
</span><span class="cx"> if (!(sidebarPanel instanceof WebInspector.SidebarPanel))
</span><del>- return null;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> console.assert(!sidebarPanel.parentSidebar);
</span><span class="cx"> if (sidebarPanel.parentSidebar)
</span><del>- return null;
</del><ins>+ return;
</ins><span class="cx">
</span><del>- this._sidebarPanels.push(sidebarPanel);
- this.addSubview(sidebarPanel);
</del><ins>+ console.assert(index >= 0 && index <= this._sidebarPanels.length);
+ this._sidebarPanels.splice(index, 0, sidebarPanel);
</ins><span class="cx">
</span><ins>+ let referenceView = this._sidebarPanels[index + 1] || null;
+ this.insertSubviewBefore(sidebarPanel, referenceView);
+
</ins><span class="cx"> if (this._navigationBar) {
</span><span class="cx"> console.assert(sidebarPanel.navigationItem);
</span><del>- this._navigationBar.addNavigationItem(sidebarPanel.navigationItem);
</del><ins>+ this._navigationBar.insertNavigationItem(sidebarPanel.navigationItem, index);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sidebarPanel.added();
</span><del>-
- return sidebarPanel;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> removeSidebarPanel(sidebarPanelOrIdentifierOrIndex)
</span><span class="lines">@@ -87,7 +93,7 @@
</span><span class="cx"> {
</span><span class="cx"> var sidebarPanel = this.findSidebarPanel(sidebarPanelOrIdentifierOrIndex);
</span><span class="cx"> if (!sidebarPanel)
</span><del>- return null;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> sidebarPanel.selected = false;
</span><span class="cx">
</span><span class="lines">@@ -110,8 +116,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sidebarPanel.removed();
</span><del>-
- return sidebarPanel;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get selectedSidebarPanel()
</span></span></pre>
</div>
</div>
</body>
</html>