Title: [201111] trunk/Source/WebInspectorUI
Revision
201111
Author
mattba...@apple.com
Date
2016-05-18 16:01:53 -0700 (Wed, 18 May 2016)

Log Message

Web Inspector: Checkbox disappears when unchecking CSS property with value containing a semicolon
https://bugs.webkit.org/show_bug.cgi?id=157862
<rdar://problem/16214480>

Reviewed by Timothy Hatcher.

* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor.prototype._createCommentedCheckboxMarker):
Modify regex to match CSS properties with url() and quoted values,
which can contain semicolons.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (201110 => 201111)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-05-18 22:52:09 UTC (rev 201110)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-05-18 23:01:53 UTC (rev 201111)
@@ -1,3 +1,16 @@
+2016-05-18  Matt Baker  <mattba...@apple.com>
+
+        Web Inspector: Checkbox disappears when unchecking CSS property with value containing a semicolon
+        https://bugs.webkit.org/show_bug.cgi?id=157862
+        <rdar://problem/16214480>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+        (WebInspector.CSSStyleDeclarationTextEditor.prototype._createCommentedCheckboxMarker):
+        Modify regex to match CSS properties with url() and quoted values,
+        which can contain semicolons.
+
 2016-05-18  Nikita Vasilyev  <nvasil...@apple.com>
 
         Web Inspector: ugly gaps in Call Trees data grid when expanding more than one level

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (201110 => 201111)


--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js	2016-05-18 22:52:09 UTC (rev 201110)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js	2016-05-18 23:01:53 UTC (rev 201111)
@@ -835,7 +835,7 @@
             return;
 
         // Matches a comment like: /* -webkit-foo: bar; */
-        var commentedPropertyRegex = /\/\*\s*[-\w]+\s*:\s*[^;]+;?\s*\*\//g;
+        let commentedPropertyRegex = /\/\*\s*[-\w]+\s*\:\s*(?:(?:\".*\"|url\(.+\)|[^;])\s*)+;?\s*\*\//g;
 
         var match = commentedPropertyRegex.exec(lineHandle.text);
         if (!match)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to