Changeset 189845 in webkit

Timestamp:

Sep 15, 2015 9:22:21 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Picking unchanged for font-size does not reset back to the unchanged value
​https://bugs.webkit.org/show_bug.cgi?id=148351

Patch by Devin Rousso <Devin Rousso> on 2015-09-15
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):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/VisualStyleNumberInputBox.js (modified) (7 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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-09-15  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleNumberInputBox.js

@@ -112 +112 @@
             return;
 
-        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;
+        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;
+            }
         }
 
@@ -129 +133 @@
 
         if (!isNaN(value)) {
-            this._numberInputIsEditable = true;
-            this.contentElement.classList.add("number-input-editable");
+            this._setNumberInputIsEditable(true);
             this._valueNumberInputElement.value = Math.round(value * 100) / 100;
             this._markUnitsContainerIfInputHasValue();
@@ -137 +140 @@
 
         if (this.valueIsSupportedKeyword(value)) {
-            this._numberInputIsEditable = false;
-            this.contentElement.classList.remove("number-input-editable");
+            this._setNumberInputIsEditable();
             this._keywordSelectElement.value = value;
             return;
@@ -170 +172 @@
             this._addAdvancedUnits();
 
-        this._numberInputIsEditable = true;
-        this.contentElement.classList.add("number-input-editable");
+        this._setNumberInputIsEditable(true);
         this._keywordSelectElement.value = unit;
         this._unitsElementTextContent = unit;
@@ -230 +231 @@
         this._unitsElement.textContent = text;
         this._markUnitsContainerIfInputHasValue();
+    }
+
+    _setNumberInputIsEditable(flag)
+    {
+        this._numberInputIsEditable = flag || false;
+        this.contentElement.classList.toggle("number-input-editable", this._numberInputIsEditable);
     }
 
@@ -247 +254 @@
 
             this._unitsElementTextContent = this._keywordSelectElement.value;
-            this._numberInputIsEditable = selectedKeywordIsUnit;
-            this.contentElement.classList.toggle("number-input-editable", selectedKeywordIsUnit);
-        }
+            this._setNumberInputIsEditable(selectedKeywordIsUnit);
+        } else
+            this._setNumberInputIsEditable(false);
 
         this._valueDidChange();
@@ -273 +280 @@
                 newValue = 0;
 
+            this._updatedValues.propertyMissing = false;
             this.value = Math.round(newValue * 100) / 100;
             this._valueDidChange();