Merge branch 'nazar-pc-fix-for-multiple-spaces'

Polymer · Nov 4, 2015 · 3378b4f · 3378b4f
2 parents 174b77b + 51a4b2c
commit 3378b4f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/lib/css-parse.html b/src/lib/css-parse.html
@@ -61,6 +61,7 @@
         var ss = node.previous ? node.previous.end : node.parent.start;
         t = text.substring(ss, node.start-1);
         t = this._expandUnicodeEscapes(t);
+        t = t.replace(this._rx.multipleSpaces, ' ');
         // TODO(sorvell): ad hoc; make selector include only after last ;
         // helps with mixin syntax
         t = t.substring(t.lastIndexOf(';')+1);
@@ -175,6 +176,7 @@
       mixinApply: /@apply[\s]*\([^)]*?\)[\s]*(?:[;\n]|$)?/gim,
       varApply: /[^;:]*?:[^;]*?var\([^;]*\)(?:[;\n]|$)?/gim,
       keyframesRule: /^@[^\s]*keyframes/,
+      multipleSpaces: /\s+/g
     },
 
     VAR_START: '--',

diff --git a/test/unit/css-parse.html b/test/unit/css-parse.html
@@ -89,6 +89,15 @@
       border-top: 3px solid red;
     }
   </style>
+
+  <style id="multiple-spaces">
+    .foo  .bar {}
+    .foo    .bar {}
+    .foo
+
+
+    .bar {}
+  </style>
 <script>
 
   function sanitizeCss(text) {
@@ -157,6 +166,13 @@
       assert.equal(t.rules[3].selector, '.\\0c3333d-model');
       assert.equal(t.rules[4].selector, '.\\d33333d-model');
       assert.equal(t.rules[5].selector, '.\\e33333d-model');
+    });
+    test('multiple consequent spaces in CSS selector', function() {
+      var s4 = document.querySelector('#multiple-spaces');
+      var t = css.parse(s4.textContent);
+      assert.equal(t.rules[0].selector, '.foo .bar');
+      assert.equal(t.rules[1].selector, '.foo .bar');
+      assert.equal(t.rules[2].selector, '.foo .bar');
     });
 
   });