properly rewrite @import rules of the form @import url(…);

googlearchive · Jan 28, 2014 · b99a12e · b99a12e
1 parent 894b784
commit b99a12e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/Parser.js b/src/Parser.js
@@ -152,7 +152,7 @@ function cloneStyle(style) {
 }
 
 var CSS_URL_REGEXP = /(url\()([^)]*)(\))/g;
-var CSS_IMPORT_REGEXP = /(@import[\s]*)([^;]*)(;)/g;
+var CSS_IMPORT_REGEXP = /(@import[\s]+(?!url\())([^;]*)(;)/g;
 
 var path = {
   resolveUrlsInStyle: function(style) {

diff --git a/test/html/imports/style-paths-import.html b/test/html/imports/style-paths-import.html
@@ -8,6 +8,7 @@
 <style>
   @import '../stuff/sheet.css';
   @import 'sheet1.css';
+  @import url(//fonts.googleapis.com/css?family=Open+Sans:300,300italic,600,800|Source+Code+Pro);
 
   .image {
     background: url(google.png);

diff --git a/test/html/style-paths.html b/test/html/style-paths.html
@@ -11,6 +11,7 @@
 <body>
   <div class="red">red</div>
   <div class="image" style="height: 20px;"></div>
+  <div style="font-family: 'Source Code Pro'">Source Code Pro</div>
   <script>
 
   document.addEventListener('HTMLImportsLoaded', function() {
@@ -25,6 +26,15 @@
     var a = document.createElement('a');
     a.href = 'imports/google.png';
     chai.assert.match(getComputedStyle(image).backgroundImage, new RegExp(a.href), 'url in style applied');
+
+    if (!HTMLImports.useNative) {
+      var style = document.querySelector('style');
+      chai.assert.ok(style.sheet);
+      chai.assert.equal(style.sheet.cssRules[2].href, 
+          'http://fonts.googleapis.com/css?family=Open+Sans:300,300italic,600,800|Source+Code+Pro',
+          '@import url() form rule has proper url')
+    }
+
     done();  
   });
   </script>