<!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>[193216] branches/safari-601-branch/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/193216">193216</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:58:30 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189845">r189845</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleNumberInputBoxjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193215 => 193216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-03 18:58:25 UTC (rev 193215)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-03 18:58:30 UTC (rev 193216)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189845. rdar://problem/23221163
+
+ 2015-09-15 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Picking unchanged for font-size does not reset back to the unchanged value
+ https://bugs.webkit.org/show_bug.cgi?id=148351
+
+ Reviewed by Brian Burg.
+
+ Visual number editors now save any new values in the special placeholder element
+ to display it whenever the "Unchanged" option is selected by the user.
+
+ * UserInterface/Views/VisualStyleNumberInputBox.js:
+ (WebInspector.VisualStyleNumberInputBox.prototype.set value):
+ (WebInspector.VisualStyleNumberInputBox.prototype.set units):
+ (WebInspector.VisualStyleNumberInputBox.prototype._setNumberInputIsEditable):
+ (WebInspector.VisualStyleNumberInputBox.prototype._keywordChanged):
+ (WebInspector.VisualStyleNumberInputBox.prototype._valueNumberInputKeyDown.adjustValue):
+ (WebInspector.VisualStyleNumberInputBox.prototype._valueNumberInputKeyDown):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r189828. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-09-15 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleNumberInputBoxjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js (193215 => 193216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js        2015-12-03 18:58:25 UTC (rev 193215)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js        2015-12-03 18:58:30 UTC (rev 193216)
</span><span class="lines">@@ -111,12 +111,16 @@
</span><span class="cx"> if (value && value === this.value)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this._updatedValues.propertyMissing && isNaN(value)) {
- this._unchangedOptionElement.selected = true;
- this._numberInputIsEditable = false;
- this.contentElement.classList.remove("number-input-editable");
- this.specialPropertyPlaceholderElement.hidden = false;
- return;
</del><ins>+ if (this._updatedValues.propertyMissing) {
+ if (value || this._updatedValues.placeholder)
+ this.specialPropertyPlaceholderElement.textContent = (value || this._updatedValues.placeholder) + (this._updatedValues.units || "");
+
+ if (isNaN(value)) {
+ this._unchangedOptionElement.selected = true;
+ this._setNumberInputIsEditable();
+ this.specialPropertyPlaceholderElement.hidden = false;
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.specialPropertyPlaceholderElement.hidden = true;
</span><span class="lines">@@ -128,16 +132,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isNaN(value)) {
</span><del>- this._numberInputIsEditable = true;
- this.contentElement.classList.add("number-input-editable");
</del><ins>+ this._setNumberInputIsEditable(true);
</ins><span class="cx"> this._valueNumberInputElement.value = Math.round(value * 100) / 100;
</span><span class="cx"> this._markUnitsContainerIfInputHasValue();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this.valueIsSupportedKeyword(value)) {
</span><del>- this._numberInputIsEditable = false;
- this.contentElement.classList.remove("number-input-editable");
</del><ins>+ this._setNumberInputIsEditable();
</ins><span class="cx"> this._keywordSelectElement.value = value;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -169,8 +171,7 @@
</span><span class="cx"> if (this._valueIsSupportedAdvancedUnit(unit))
</span><span class="cx"> this._addAdvancedUnits();
</span><span class="cx">
</span><del>- this._numberInputIsEditable = true;
- this.contentElement.classList.add("number-input-editable");
</del><ins>+ this._setNumberInputIsEditable(true);
</ins><span class="cx"> this._keywordSelectElement.value = unit;
</span><span class="cx"> this._unitsElementTextContent = unit;
</span><span class="cx"> }
</span><span class="lines">@@ -231,6 +232,12 @@
</span><span class="cx"> this._markUnitsContainerIfInputHasValue();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _setNumberInputIsEditable(flag)
+ {
+ this._numberInputIsEditable = flag || false;
+ this.contentElement.classList.toggle("number-input-editable", this._numberInputIsEditable);
+ }
+
</ins><span class="cx"> _markUnitsContainerIfInputHasValue()
</span><span class="cx"> {
</span><span class="cx"> var numberInputValue = this._valueNumberInputElement.value;
</span><span class="lines">@@ -246,9 +253,9 @@
</span><span class="cx"> this._valueNumberInputElement.value = null;
</span><span class="cx">
</span><span class="cx"> this._unitsElementTextContent = this._keywordSelectElement.value;
</span><del>- this._numberInputIsEditable = selectedKeywordIsUnit;
- this.contentElement.classList.toggle("number-input-editable", selectedKeywordIsUnit);
- }
</del><ins>+ this._setNumberInputIsEditable(selectedKeywordIsUnit);
+ } else
+ this._setNumberInputIsEditable(false);
</ins><span class="cx">
</span><span class="cx"> this._valueDidChange();
</span><span class="cx"> this.specialPropertyPlaceholderElement.hidden = !unchangedOptionSelected;
</span><span class="lines">@@ -272,6 +279,7 @@
</span><span class="cx"> if (!this._allowNegativeValues && newValue < 0)
</span><span class="cx"> newValue = 0;
</span><span class="cx">
</span><ins>+ this._updatedValues.propertyMissing = false;
</ins><span class="cx"> this.value = Math.round(newValue * 100) / 100;
</span><span class="cx"> this._valueDidChange();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>