fix(css_shim): allow "..." for content

fixes #1565
dart-archive · Dec 16, 2014 · 9a369e3 · 9a369e3
1 parent ac4bc17
commit 9a369e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/core_dom/css_shim.dart b/lib/core_dom/css_shim.dart
@@ -54,15 +54,15 @@ class _CssShim {
 
   static final RegExp CONTENT = new RegExp(
       r"[^}]*"
-      r"content\:[\s]*"
-      r"'([^']*)'"
+      r"content:\s*"
+      "('|\")([^\\1]*)\\1"
       r"[^}]*}",
       caseSensitive: false,
       multiLine: true
   );
 
   static final String HOST_TOKEN = '-host-element';
-  static final RegExp COLON_SELECTORS = new RegExp(r'(' + HOST_TOKEN + r')(\(.*\)){0,1}(.*)',
+  static final RegExp COLON_SELECTORS = new RegExp(r'(' + HOST_TOKEN + r')(\(.*\))?(.*)',
       caseSensitive: false);
   static final RegExp SIMPLE_SELECTORS = new RegExp(r'([^:]*)(:*)(.*)', caseSensitive: false);
   static final RegExp IS_SELECTORS = new RegExp(r'\[is="([^\]]*)"\]', caseSensitive: false);
@@ -152,7 +152,7 @@ class _CssShim {
   }
 
   String extractContent(_Rule rule) {
-    return CONTENT.firstMatch(rule.body)[1];
+    return CONTENT.firstMatch(rule.body)[2];
   }
 
   String ruleToString(_Rule rule) {
@@ -412,4 +412,4 @@ class _Parser {
 
   _Token get current => tokens[currentIndex];
   _Token get next => tokens[currentIndex + 1];
-}
+}
diff --git a/test/core_dom/css_shim_spec.dart b/test/core_dom/css_shim_spec.dart
@@ -2,7 +2,6 @@ library css_shim_spec;
 
 import '../_specs.dart';
 import 'package:angular/core_dom/css_shim.dart';
-import 'dart:html' as dom;
 
 main() {
   describe("cssShim", () {
@@ -78,11 +77,17 @@ main() {
     it("should support polyfill-next-selector", () {
       var css = s("polyfill-next-selector {content: 'x > y'} z {}", "a");
       expect(css).toEqual('x[a]>y[a] {}');
+
+      css = s('polyfill-next-selector {content: "x > y"} z {}', "a");
+      expect(css).toEqual('x[a]>y[a] {}');
     });
 
     it("should support polyfill-unscoped-next-selector", () {
       var css = s("polyfill-unscoped-next-selector {content: 'x > y'} z {}", "a");
       expect(css).toEqual('x > y {}');
+
+      css = s('polyfill-unscoped-next-selector {content: "x > y"} z {}', "a");
+      expect(css).toEqual('x > y {}');
     });
 
     it("should support polyfill-non-strict-next-selector", () {
@@ -100,4 +105,4 @@ main() {
       expect(css).toEqual('a x   y {}');
     });
   });
-}
+}