<!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>[192584] 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/192584">192584</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-11-18 13:36:40 -0800 (Wed, 18 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Watch Expressions details section should use NavigationBar
https://bugs.webkit.org/show_bug.cgi?id=151377
Reviewed by Timothy Hatcher.
Replaces image elements with a NavigationBar instance. The refresh and
clear buttons are disabled if no watch expressions exist.
* Localizations/en.lproj/localizedStrings.js:
New navigation item labels.
* UserInterface/Views/ScopeChainDetailsSidebarPanel.css:
(.details-section.watch-expressions .options > *): Deleted.
(.details-section.watch-expressions .options > *:active): Deleted.
(.details-section.watch-expressions .options > .watch-expression-add): Deleted.
(.details-section.watch-expressions .options > .watch-expression-clear): Deleted.
(.details-section.watch-expressions .options > .watch-expression-refresh): Deleted.
Remove <img> button styles.
* UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
(WebInspector.ScopeChainDetailsSidebarPanel):
(WebInspector.ScopeChainDetailsSidebarPanel.prototype._addWatchExpressionButtonClicked.presentPopoverOverTargetElement):
Use the navigation item element.
(WebInspector.ScopeChainDetailsSidebarPanel.prototype._updateWatchExpressionsNavigationBar):
Enable/disable refresh and clear buttons.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (192583 => 192584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-11-18 19:47:08 UTC (rev 192583)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-11-18 21:36:40 UTC (rev 192584)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-11-18 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Watch Expressions details section should use NavigationBar
+ https://bugs.webkit.org/show_bug.cgi?id=151377
+
+ Reviewed by Timothy Hatcher.
+
+ Replaces image elements with a NavigationBar instance. The refresh and
+ clear buttons are disabled if no watch expressions exist.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ New navigation item labels.
+
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.css:
+ (.details-section.watch-expressions .options > *): Deleted.
+ (.details-section.watch-expressions .options > *:active): Deleted.
+ (.details-section.watch-expressions .options > .watch-expression-add): Deleted.
+ (.details-section.watch-expressions .options > .watch-expression-clear): Deleted.
+ (.details-section.watch-expressions .options > .watch-expression-refresh): Deleted.
+ Remove <img> button styles.
+
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+ (WebInspector.ScopeChainDetailsSidebarPanel):
+ (WebInspector.ScopeChainDetailsSidebarPanel.prototype._addWatchExpressionButtonClicked.presentPopoverOverTargetElement):
+ Use the navigation item element.
+ (WebInspector.ScopeChainDetailsSidebarPanel.prototype._updateWatchExpressionsNavigationBar):
+ Enable/disable refresh and clear buttons.
+
</ins><span class="cx"> 2015-11-17 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Move Timeline creation into a recording
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (192583 => 192584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-11-18 19:47:08 UTC (rev 192583)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-11-18 21:36:40 UTC (rev 192584)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> localizedStrings["Add New"] = "Add New";
</span><span class="cx"> localizedStrings["Add New Probe Expression"] = "Add New Probe Expression";
</span><span class="cx"> localizedStrings["Add New Watch Expression"] = "Add New Watch Expression";
</span><del>-localizedStrings["Add Watch Expression"] = "Add Watch Expression";
</del><span class="cx"> localizedStrings["Add new breakpoint action after this action"] = "Add new breakpoint action after this action";
</span><ins>+localizedStrings["Add watch expression"] = "Add watch expression";
</ins><span class="cx"> localizedStrings["Additions"] = "Additions";
</span><span class="cx"> localizedStrings["Align"] = "Align";
</span><span class="cx"> localizedStrings["Alignment"] = "Alignment";
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> localizedStrings["Child Layers"] = "Child Layers";
</span><span class="cx"> localizedStrings["Children"] = "Children";
</span><span class="cx"> localizedStrings["Clear"] = "Clear";
</span><del>-localizedStrings["Clear All Watch Expressions"] = "Clear All Watch Expressions";
</del><span class="cx"> localizedStrings["Clear Log"] = "Clear Log";
</span><span class="cx"> localizedStrings["Clear Log on Navigation"] = "Clear Log on Navigation";
</span><span class="cx"> localizedStrings["Clear Timeline"] = "Clear Timeline";
</span><span class="cx"> localizedStrings["Clear log (%s or %s)"] = "Clear log (%s or %s)";
</span><ins>+localizedStrings["Clear watch expressions"] = "Clear watch expressions";
</ins><span class="cx"> localizedStrings["Click Listener"] = "Click Listener";
</span><span class="cx"> localizedStrings["Click or press the spacebar to record."] = "Click or press the spacebar to record.";
</span><span class="cx"> localizedStrings["Click or press the spacebar to stop recording."] = "Click or press the spacebar to stop recording.";
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> localizedStrings["Reference Issue"] = "Reference Issue";
</span><span class="cx"> localizedStrings["Reflection"] = "Reflection";
</span><span class="cx"> localizedStrings["Refresh"] = "Refresh";
</span><del>-localizedStrings["Refresh All Watch Expressions"] = "Refresh All Watch Expressions";
</del><ins>+localizedStrings["Refresh watch expressions"] = "Refresh watch expressions";
</ins><span class="cx"> localizedStrings["Region Flow"] = "Region Flow";
</span><span class="cx"> localizedStrings["Region announced in its entirety."] = "Region announced in its entirety.";
</span><span class="cx"> localizedStrings["Reload page (%s)\nReload ignoring cache (%s)"] = "Reload page (%s)\nReload ignoring cache (%s)";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.css (192583 => 192584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.css 2015-11-18 19:47:08 UTC (rev 192583)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.css 2015-11-18 21:36:40 UTC (rev 192584)
</span><span class="lines">@@ -23,29 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.details-section.watch-expressions .options > * {
- float: right;
- margin-top: 1px;
- margin-left: 5px;
- height: 13px;
-}
-
-.details-section.watch-expressions .options > *:active {
- opacity: 0.7;
-}
-
-.details-section.watch-expressions .options > .watch-expression-add {
- content: url(../Images/Plus13.svg);
-}
-
-.details-section.watch-expressions .options > .watch-expression-clear {
- content: url(../Images/NavigationItemTrash.svg);
-}
-
-.details-section.watch-expressions .options > .watch-expression-refresh {
- content: url(../Images/ReloadFull.svg);
-}
-
</del><span class="cx"> .popover .watch-expression {
</span><span class="cx"> padding: 5px;
</span><span class="cx"> margin: 2px;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (192583 => 192584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-11-18 19:47:08 UTC (rev 192583)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-11-18 21:36:40 UTC (rev 192584)
</span><span class="lines">@@ -32,32 +32,32 @@
</span><span class="cx"> this._callFrame = null;
</span><span class="cx">
</span><span class="cx"> this._watchExpressionsSetting = new WebInspector.Setting("watch-expressions", []);
</span><ins>+ this._watchExpressionsSetting.addEventListener(WebInspector.Setting.Event.Changed, this._updateWatchExpressionsNavigationBar, this);
</ins><span class="cx">
</span><span class="cx"> this._watchExpressionOptionsElement = document.createElement("div");
</span><span class="cx"> this._watchExpressionOptionsElement.classList.add("options");
</span><span class="cx">
</span><del>- let refreshAllWatchExpressionButton = this._watchExpressionOptionsElement.appendChild(document.createElement("img"));
- refreshAllWatchExpressionButton.classList.add("watch-expression-refresh");
- refreshAllWatchExpressionButton.setAttribute("role", "button");
- refreshAllWatchExpressionButton.title = WebInspector.UIString("Refresh All Watch Expressions");
- refreshAllWatchExpressionButton.addEventListener("click", this._refreshAllWatchExpressionsButtonClicked.bind(this));
</del><ins>+ this._navigationBar = new WebInspector.NavigationBar;
+ this._watchExpressionOptionsElement.appendChild(this._navigationBar.element);
</ins><span class="cx">
</span><del>- let clearAllWatchExpressionButton = this._watchExpressionOptionsElement.appendChild(document.createElement("img"));
- clearAllWatchExpressionButton.classList.add("watch-expression-clear");
- clearAllWatchExpressionButton.setAttribute("role", "button");
- clearAllWatchExpressionButton.title = WebInspector.UIString("Clear All Watch Expressions");
- clearAllWatchExpressionButton.addEventListener("click", this._clearAllWatchExpressionsButtonClicked.bind(this));
</del><ins>+ let addWatchExpressionButton = new WebInspector.ButtonNavigationItem("add-watch-expression", WebInspector.UIString("Add watch expression"), "Images/Plus13.svg", 13, 13);
+ addWatchExpressionButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._addWatchExpressionButtonClicked, this);
+ this._navigationBar.addNavigationItem(addWatchExpressionButton);
</ins><span class="cx">
</span><del>- let addWatchExpressionButton = this._watchExpressionOptionsElement.appendChild(document.createElement("img"));
- addWatchExpressionButton.classList.add("watch-expression-add");
- addWatchExpressionButton.title = WebInspector.UIString("Add Watch Expression");
- addWatchExpressionButton.setAttribute("role", "button");
- addWatchExpressionButton.addEventListener("click", this._addWatchExpressionButtonClicked.bind(this));
</del><ins>+ this._clearAllWatchExpressionButton = new WebInspector.ButtonNavigationItem("clear-watch-expressions", WebInspector.UIString("Clear watch expressions"), "Images/CloseLarge.svg", 13, 13);
+ this._clearAllWatchExpressionButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearAllWatchExpressionsButtonClicked, this);
+ this._navigationBar.addNavigationItem(this._clearAllWatchExpressionButton);
</ins><span class="cx">
</span><ins>+ this._refreshAllWatchExpressionButton = new WebInspector.ButtonNavigationItem("refresh-watch-expressions", WebInspector.UIString("Refresh watch expressions"), "Images/ReloadFull.svg", 13, 13);
+ this._refreshAllWatchExpressionButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshAllWatchExpressionsButtonClicked, this);
+ this._navigationBar.addNavigationItem(this._refreshAllWatchExpressionButton);
+
</ins><span class="cx"> this._watchExpressionsSectionGroup = new WebInspector.DetailsSectionGroup;
</span><span class="cx"> this._watchExpressionsSection = new WebInspector.DetailsSection("watch-expressions", WebInspector.UIString("Watch Expressions"), [this._watchExpressionsSectionGroup], this._watchExpressionOptionsElement);
</span><span class="cx"> this.contentElement.appendChild(this._watchExpressionsSection.element);
</span><span class="cx">
</span><ins>+ this._updateWatchExpressionsNavigationBar();
+
</ins><span class="cx"> this.needsRefresh();
</span><span class="cx">
</span><span class="cx"> // Update on console prompt eval as objects in the scope chain may have changed.
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> {
</span><span class="cx"> function presentPopoverOverTargetElement()
</span><span class="cx"> {
</span><del>- let target = WebInspector.Rect.rectFromClientRect(event.target.getBoundingClientRect());
</del><ins>+ let target = WebInspector.Rect.rectFromClientRect(event.target.element.getBoundingClientRect());
</ins><span class="cx"> popover.present(target, [WebInspector.RectEdge.MAX_Y, WebInspector.RectEdge.MIN_Y, WebInspector.RectEdge.MAX_X]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -449,6 +449,13 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ScopeChainDetailsSidebarPanel._autoExpandProperties.delete(propertyPathIdentifier);
</span><span class="cx"> }
</span><ins>+
+ _updateWatchExpressionsNavigationBar()
+ {
+ let enabled = this._watchExpressionsSetting.value.length;
+ this._refreshAllWatchExpressionButton.enabled = enabled;
+ this._clearAllWatchExpressionButton.enabled = enabled;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ScopeChainDetailsSidebarPanel._autoExpandProperties = new Set;
</span></span></pre>
</div>
</div>
</body>
</html>