<!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>[196692] 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/196692">196692</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-02-17 08:01:23 -0800 (Wed, 17 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add singular and plural cases for "Ignore n times before stopping" label in breakpoint editor
https://bugs.webkit.org/show_bug.cgi?id=154335
<rdar://problem/24655491>
Reviewed by Timothy Hatcher.
* Localizations/en.lproj/localizedStrings.js:
Added string for singular ignore count.
* UserInterface/Controllers/BreakpointPopoverController.js:
(WebInspector.BreakpointPopoverController.prototype._createPopoverContent):
Remove unused variable "this._ignoreCount" and update ignore count text.
(WebInspector.BreakpointPopoverController.prototype._popoverIgnoreInputChanged):
Update ignore count text as value changes.
(WebInspector.BreakpointPopoverController.prototype._updateIgnoreCountText):
Set singular text when count === 1, otherwise set plural text.</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="#trunkSourceWebInspectorUIUserInterfaceControllersBreakpointPopoverControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (196691 => 196692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-17 11:45:30 UTC (rev 196691)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-17 16:01:23 UTC (rev 196692)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-17 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Add singular and plural cases for "Ignore n times before stopping" label in breakpoint editor
+ https://bugs.webkit.org/show_bug.cgi?id=154335
+ <rdar://problem/24655491>
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Added string for singular ignore count.
+
+ * UserInterface/Controllers/BreakpointPopoverController.js:
+ (WebInspector.BreakpointPopoverController.prototype._createPopoverContent):
+ Remove unused variable "this._ignoreCount" and update ignore count text.
+
+ (WebInspector.BreakpointPopoverController.prototype._popoverIgnoreInputChanged):
+ Update ignore count text as value changes.
+
+ (WebInspector.BreakpointPopoverController.prototype._updateIgnoreCountText):
+ Set singular text when count === 1, otherwise set plural text.
+
</ins><span class="cx"> 2016-02-16 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r196620): Web Inspector: Selecting last message in the console makes the scrollbar visible
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (196691 => 196692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-02-17 11:45:30 UTC (rev 196691)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-02-17 16:01:23 UTC (rev 196692)
</span><span class="lines">@@ -721,6 +721,7 @@
</span><span class="cx"> localizedStrings["key"] = "key";
</span><span class="cx"> localizedStrings["line "] = "line ";
</span><span class="cx"> localizedStrings["originally %s"] = "originally %s";
</span><ins>+localizedStrings["time before stopping"] = "time before stopping";
</ins><span class="cx"> localizedStrings["times before stopping"] = "times before stopping";
</span><span class="cx"> localizedStrings["value"] = "value";
</span><span class="cx"> localizedStrings[" %s Profile Recorded"] = " %s Profile Recorded";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersBreakpointPopoverControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js (196691 => 196692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js 2016-02-17 11:45:30 UTC (rev 196691)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js 2016-02-17 16:01:23 UTC (rev 196692)
</span><span class="lines">@@ -180,13 +180,14 @@
</span><span class="cx"> this._ignoreCountInput.id = "edit-breakpoint-popover-ignore";
</span><span class="cx"> this._ignoreCountInput.type = "number";
</span><span class="cx"> this._ignoreCountInput.min = 0;
</span><del>- this._ignoreCountInput.value = this._ignoreCount || 0;
</del><ins>+ this._ignoreCountInput.value = 0;
</ins><span class="cx"> this._ignoreCountInput.addEventListener("change", this._popoverIgnoreInputChanged.bind(this));
</span><span class="cx">
</span><del>- let ignoreCountText = ignoreCountData.appendChild(document.createElement("span"));
</del><span class="cx"> ignoreCountLabel.setAttribute("for", this._ignoreCountInput.id);
</span><span class="cx"> ignoreCountLabel.textContent = WebInspector.UIString("Ignore");
</span><del>- ignoreCountText.textContent = WebInspector.UIString("times before stopping");
</del><ins>+
+ this._ignoreCountText = ignoreCountData.appendChild(document.createElement("span"));
+ this._updateIgnoreCountText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> let actionRow = table.appendChild(document.createElement("tr"));
</span><span class="lines">@@ -259,6 +260,8 @@
</span><span class="cx">
</span><span class="cx"> this._ignoreCountInput.value = ignoreCount;
</span><span class="cx"> this._breakpoint.ignoreCount = ignoreCount;
</span><ins>+
+ this._updateIgnoreCountText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _popoverToggleAutoContinueCheckboxChanged(event)
</span><span class="lines">@@ -298,6 +301,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _updateIgnoreCountText()
+ {
+ if (this._breakpoint.ignoreCount === 1)
+ this._ignoreCountText.textContent = WebInspector.UIString("time before stopping");
+ else
+ this._ignoreCountText.textContent = WebInspector.UIString("times before stopping");
+ }
+
</ins><span class="cx"> breakpointActionViewAppendActionView(breakpointActionView, newAction)
</span><span class="cx"> {
</span><span class="cx"> let newBreakpointActionView = new WebInspector.BreakpointActionView(newAction, this);
</span></span></pre>
</div>
</div>
</body>
</html>