Changeset 204510 in webkit

Timestamp:

Aug 16, 2016 9:57:27 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Visual Styles: "Text -> Content" isn't escaped
​https://bugs.webkit.org/show_bug.cgi?id=158271

Patch by Devin Rousso <Devin Rousso> on 2016-08-16
Reviewed by Timothy Hatcher.

• UserInterface/Base/Utilities.js:

(String.prototype.hasMatchingEscapedQuotes):
Checks that the given string has property escaped quotes (single or double).

• UserInterface/Views/VisualStyleBasicInput.js:

(WebInspector.VisualStyleBasicInput):
(WebInspector.VisualStyleBasicInput.prototype._handleInputElementInput):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Utilities.js (modified) (1 diff)
• UserInterface/Views/VisualStyleBasicInput.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-08-16  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: Visual Styles: "Text -> Content" isn't escaped
+        https://bugs.webkit.org/show_bug.cgi?id=158271
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Utilities.js:
+        (String.prototype.hasMatchingEscapedQuotes):
+        Checks that the given string has property escaped quotes (single or double).
+
+        * UserInterface/Views/VisualStyleBasicInput.js:
+        (WebInspector.VisualStyleBasicInput):
+        (WebInspector.VisualStyleBasicInput.prototype._handleInputElementInput):
+
 2016-08-16  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js

@@ -918 +918 @@
 });
 
+Object.defineProperty(String.prototype, "hasMatchingEscapedQuotes",
+{
+    value: function()
+    {
+        return /^\"(?:[^\"\\]|\\.)*\"$/.test(this) || /^\'(?:[^\'\\]|\\.)*\'$/.test(this);
+    }
+});
+
 Object.defineProperty(Math, "roundTo",
 {

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

@@ -33 +33 @@
         this._inputElement.spellcheck = false;
         this._inputElement.setAttribute("placeholder", placeholder || "");
-        this._inputElement.addEventListener("input", this._handleInputElementInput.bind(this));
+        this._inputElement.addEventListener("input", this.debounce(500)._handleInputElementInput);
     }
 
@@ -60 +60 @@
     _handleInputElementInput(event)
     {
+        let value = this.value;
+        if (value && value.trim().length) {
+            let validItems = [];
+            for (let item of value.split(/([^\"\'\s]+|\"[^\"]*\"|\'[^\']*\')/)) {
+                if (!item.length || (!item.hasMatchingEscapedQuotes() && !/^[\w\s\-\.\(\)]+$/.test(item)))
+                    continue;
+
+                validItems.push(item);
+            }
+
+            this.value = validItems.filter(item => item.trim().length).join(" ");
+        }
+
         this._valueDidChange();
     }