Title: [185471] trunk/Source/WebInspectorUI
Revision
185471
Author
[email protected]
Date
2015-06-11 13:51:11 -0700 (Thu, 11 Jun 2015)

Log Message

Web Inspector: font-family names interpreted as color
https://bugs.webkit.org/show_bug.cgi?id=123468

Patch by Devin Rousso <[email protected]> on 2015-06-11
Reviewed by Timothy Hatcher.

* UserInterface/Views/CodeMirrorAdditions.js: Added logic to prevent color picker buttons from appearing before colors that come after a quote character (both " and ').

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (185470 => 185471)


--- trunk/Source/WebInspectorUI/ChangeLog	2015-06-11 20:50:34 UTC (rev 185470)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-06-11 20:51:11 UTC (rev 185471)
@@ -1,3 +1,12 @@
+2015-06-11  Devin Rousso  <[email protected]>
+
+        Web Inspector: font-family names interpreted as color
+        https://bugs.webkit.org/show_bug.cgi?id=123468
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/CodeMirrorAdditions.js: Added logic to prevent color picker buttons from appearing before colors that come after a quote character (both " and ').
+
 2015-06-11  Matt Baker  <[email protected]>
 
         Web Inspector: Rendering Frames timeline should distinguish between layout and painting

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (185470 => 185471)


--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js	2015-06-11 20:50:34 UTC (rev 185470)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js	2015-06-11 20:51:11 UTC (rev 185471)
@@ -511,7 +511,7 @@
             while (match) {
 
                 // Act as a negative look-behind and disallow the color from being prefixing with certain characters.
-                if (match.index > 0 && /[-.]/.test(lineContent[match.index - 1])) {
+                if (match.index > 0 && /[-.\"\']/.test(lineContent[match.index - 1])) {
                     match = colorRegex.exec(lineContent);
                     continue;
                 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to