Changeset 82674 in webkit

Timestamp:

Apr 1, 2011 6:14:24 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

2011-04-01 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: up/down keys are not treating hex numbers properly while editing styles.
​https://bugs.webkit.org/show_bug.cgi?id=40522

Drive-by: fix inc/dec for numbers like ".5"

Test: inspector/styles/up-down-numerics-and-colors.html

WebCore:

• inspector/front-end/StylesSidebarPane.js: (WebInspector.StylePropertyTreeElement.prototype):

LayoutTests:

• http/tests/inspector/inspector-test.js: (initialize_InspectorTest.InspectorTest.createKeyEvent): Added arguments for key modifiers.
• inspector/styles/up-down-numerics-and-colors-expected.txt: Added.
• inspector/styles/up-down-numerics-and-colors.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/inspector-test.js (modified) (1 diff)
• LayoutTests/inspector/styles/up-down-numerics-and-colors-expected.txt (added)
• LayoutTests/inspector/styles/up-down-numerics-and-colors.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/StylesSidebarPane.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-01  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: up/down keys are not treating hex numbers properly while editing styles.
+        https://bugs.webkit.org/show_bug.cgi?id=40522
+
+        * http/tests/inspector/inspector-test.js:
+        (initialize_InspectorTest.InspectorTest.createKeyEvent): Added arguments for key modifiers.
+        * inspector/styles/up-down-numerics-and-colors-expected.txt: Added.
+        * inspector/styles/up-down-numerics-and-colors.html: Added.
+
 2011-04-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/http/tests/inspector/inspector-test.js

@@ -158 +158 @@
 }
 
-InspectorTest.createKeyEvent = function(keyIdentifier)
+InspectorTest.createKeyEvent = function(keyIdentifier, ctrlKey, altKey, shiftKey, metaKey)
 {
     var evt = document.createEvent("KeyboardEvent");
-    evt.initKeyboardEvent("keydown", true /* can bubble */, true /* can cancel */, null /* view */, keyIdentifier, "");
+    evt.initKeyboardEvent("keydown", true /* can bubble */, true /* can cancel */, null /* view */, keyIdentifier, "", ctrlKey, altKey, shiftKey, metaKey);
     return evt;
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-01  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: up/down keys are not treating hex numbers properly while editing styles.
+        https://bugs.webkit.org/show_bug.cgi?id=40522
+
+        Drive-by: fix inc/dec for numbers like ".5"
+
+        Test: inspector/styles/up-down-numerics-and-colors.html
+
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylePropertyTreeElement.prototype):
+
 2011-03-30  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js

@@ -1644 +1644 @@
         var wordRange = selectionRange.startContainer.rangeOfWord(selectionRange.startOffset, WebInspector.StylesSidebarPane.StyleValueDelimiters, this.valueElement);
         var wordString = wordRange.toString();
-        var replacementString = wordString;
-
-        var matches = /(.*?)(-?\d+(?:\.\d+)?)(.*)/.exec(wordString);
+        var replacementString;
+        var prefix, suffix, number;
+
+        var matches;
+        matches = /(.*#)([\da-fA-F]+)(.*)/.exec(wordString);
         if (matches && matches.length) {
-            var prefix = matches[1];
-            var number = parseFloat(matches[2]);
-            var suffix = matches[3];
-
-            // If the number is near zero or the number is one and the direction will take it near zero.
-            var numberNearZero = (number < 1 && number > -1);
-            if (number === 1 && event.keyIdentifier === "Down")
-                numberNearZero = true;
-            else if (number === -1 && event.keyIdentifier === "Up")
-                numberNearZero = true;
-
-            if (numberNearZero && event.altKey && arrowKeyPressed) {
-                if (event.keyIdentifier === "Down")
-                    number = Math.ceil(number - 1);
-                else
-                    number = Math.floor(number + 1);
-            } else {
-                // Jump by 10 when shift is down or jump by 0.1 when near zero or Alt/Option is down.
-                // Also jump by 10 for page up and down, or by 100 if shift is held with a page key.
-                var changeAmount = 1;
-                if (event.shiftKey && pageKeyPressed)
-                    changeAmount = 100;
-                else if (event.shiftKey || pageKeyPressed)
-                    changeAmount = 10;
-                else if (event.altKey || numberNearZero)
-                    changeAmount = 0.1;
-
-                if (event.keyIdentifier === "Down" || event.keyIdentifier === "PageDown")
-                    changeAmount *= -1;
-
-                // Make the new number and constrain it to a precision of 6, this matches numbers the engine returns.
-                // Use the Number constructor to forget the fixed precision, so 1.100000 will print as 1.1.
-                number = Number((number + changeAmount).toFixed(6));
-            }
+            prefix = matches[1];
+            suffix = matches[3];
+            number = this._alteredHexNumber(matches[2], event);
 
             replacementString = prefix + number + suffix;
-
+        } else {
+            matches = /(.*?)(-?(?:\d+(?:\.\d+)?|\.\d+))(.*)/.exec(wordString);
+            if (matches && matches.length) {
+                prefix = matches[1];
+                suffix = matches[3];
+                number = this._alteredFloatNumber(parseFloat(matches[2]), event);
+
+                replacementString = prefix + number + suffix;
+            }
+        }
+
+        if (replacementString) {
             var replacementTextNode = document.createTextNode(replacementString);
 
@@ -1709 +1691 @@
             this.applyStyleText(this.nameElement.textContent + ": " + this.valueElement.textContent);
         }
+    },
+
+    _alteredFloatNumber: function(number, event)
+    {
+        var arrowKeyPressed = (event.keyIdentifier === "Up" || event.keyIdentifier === "Down");
+        // If the number is near zero or the number is one and the direction will take it near zero.
+        var numberNearZero = (number < 1 && number > -1);
+        if (number === 1 && event.keyIdentifier === "Down")
+            numberNearZero = true;
+        else if (number === -1 && event.keyIdentifier === "Up")
+            numberNearZero = true;
+
+        var result;
+        if (numberNearZero && event.altKey && arrowKeyPressed) {
+            if (event.keyIdentifier === "Down")
+                result = Math.ceil(number - 1);
+            else
+                result = Math.floor(number + 1);
+        } else {
+            // Jump by 10 when shift is down or jump by 0.1 when near zero or Alt/Option is down.
+            // Also jump by 10 for page up and down, or by 100 if shift is held with a page key.
+            var changeAmount = 1;
+            if (event.shiftKey && !arrowKeyPressed)
+                changeAmount = 100;
+            else if (event.shiftKey || !arrowKeyPressed)
+                changeAmount = 10;
+            else if (event.altKey || numberNearZero)
+                changeAmount = 0.1;
+
+            if (event.keyIdentifier === "Down" || event.keyIdentifier === "PageDown")
+                changeAmount *= -1;
+
+            // Make the new number and constrain it to a precision of 6, this matches numbers the engine returns.
+            // Use the Number constructor to forget the fixed precision, so 1.100000 will print as 1.1.
+            result = Number((number + changeAmount).toFixed(6));
+        }
+
+        return result;
+    },
+
+    _alteredHexNumber: function(hexString, event)
+    {
+        var number = parseInt(hexString, 16);
+        if (isNaN(number) || !isFinite(number))
+            return hexString;
+
+        var maxValue = Math.pow(16, hexString.length) - 1;
+        var arrowKeyPressed = (event.keyIdentifier === "Up" || event.keyIdentifier === "Down");
+
+        var delta;
+        if (arrowKeyPressed)
+            delta = (event.keyIdentifier === "Up") ? 1 : -1;
+        else
+            delta = (event.keyIdentifier === "PageUp") ? 16 : -16;
+
+        if (event.shiftKey)
+            delta *= 16;
+
+        var result = number + delta;
+        if (result < 0)
+            result = 0; // Color hex values are never negative, so clamp to 0.
+        else if (result > maxValue)
+            return hexString;
+
+        // Ensure the result length is the same as the original hex value.
+        var resultString = result.toString(16).toUpperCase();
+        for (var i = 0, lengthDelta = hexString.length - resultString.length; i < lengthDelta; ++i)
+            resultString = "0" + resultString;
+        return resultString;
     },