Fixes #1389 (reviewed by @kevinpschaaf)

Polymer · May 23, 2015 · 6433f62 · 6433f62
1 parent 3573f63
commit 6433f62
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/lib/css-parse.html b/src/lib/css-parse.html
@@ -154,8 +154,8 @@
   var rx = {
     comments: /\/\*[^*]*\*+([^/*][^*]*\*+)*\//gim,
     port: /@import[^;]*;/gim,
-    customProp: /--[^;{]*?:[^{};]*?;/gim,
-    mixinProp: /--[^;{]*?:[^{;]*?{[^}]*?};?/gim,
+    customProp: /(?:^|[\s;])--[^;{]*?:[^{};]*?;/gim,
+    mixinProp: /(?:^|[\s;])--[^;{]*?:[^{;]*?{[^}]*?};?/gim,
     mixinApply: /@apply[\s]*\([^)]*?\)[\s]*;/gim,
     varApply: /[^;:]*?:[^;]*var[^;]*;/gim,
     keyframesRule: /^@[^\s]*keyframes/,

diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
@@ -150,6 +150,7 @@
   <dom-module id="x-scope">
     <style>
       :host {
+        x--invalid: 15px solid gray;
         display: block;
         padding: 8px;
         --scope-var: 1px solid black;
@@ -207,6 +208,10 @@
       x-host-property {
         border: 10px solid purple;
       }
+
+      #invalid {
+        border: var(--invalid);
+      }
     </style>
 
     <template>
@@ -220,6 +225,7 @@
       <div id="applyDefault2">var default</div>
       <div id="calc">Calc</div>
       <div id="shadow">Shadow</div>
+      <div id="invalid">invalid</div>
       <x-host-property id="hostProp"></x-host-property>
       <x-has-if id="iffy"></x-has-if>
     </template>
@@ -272,6 +278,11 @@
 
   });
 
+  test('invalid variables not parsed', function() {
+    assert.notProperty(styled._styleProperties, 'x--invalid');
+    assertComputed(styled.$.invalid, '0px');
+  });
+
   test('simple variables applied correctly between scopes', function() {
      assertComputed(styled.$.me, '1px');
      assertComputed(styled.$.child.$.me, '2px');