Merge pull request #14 from ganlanyuan/fix-import-url

fixes from jesstelford

Author: corysimmons

config.codekit

@@ -63,7 +63,7 @@
 
 	// Stylesheet parsing regexp's
 	var RE_COMMENT							= /(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)\s*?/g;
-	var RE_IMPORT							= /@import\s*(?:(?:(?:url\(\s*(['"]?)(.*)\1)\s*\))|(?:(['"])(.*)\3))\s*([^;]*);/g;
+	var RE_IMPORT							= /@import\s*(?:(?:(?:url\(\s*(['"]?)([^;]*)\1)\s*\))|(?:(['"])([^;]*)\3))\s*([^;]*);/g;
 	var RE_ASSET_URL 						= /(behavior\s*?:\s*)?\burl\(\s*(["']?)(?!data:)([^"')]+)\2\s*\)/g;
 	var RE_PSEUDO_STRUCTURAL				= /^:(empty|(first|last|only|nth(-last)?)-(child|of-type))$/;
 	var RE_PSEUDO_ELEMENTS					= /:(:first-(?:line|letter))/g;

selectivizr2.js

@@ -1,6 +1,6 @@
 /* if @media type filtering doesn't work we want this test to fail */
 
 tr#import-print { 
-	background: #c00; 
+	background: #0c0; 
 }
 

tests/master/css/import-print.css

@@ -29,13 +29,25 @@
 @import url("import-print.css") print;
 @import url("import-screen.css") screen;
 
-#import-print {
-	background: #0c0;
-}
+/* When parsing @import of minified CSS, ensure the Regex isn't too greedy */
+@import url("min-import-url-quoted-double.css");.minified{background:url("css/nested/test.png");}
+@import url('min-import-url-quoted-single.css');.minified{background:url("css/nested/test.png");}
+@import url(min-import-url-unquoted.css);.minified{background:url("css/nested/test.png");}
+@import "min-import-quoted-double.css";.minified{background:url("css/nested/test.png");}
+@import "min-import-quoted-single.css";.minified{background:url("css/nested/test.png");}
+@import url("nested/min-import-url-relative-path.css");.minified{background:url("css/nested/test.png");}
+/* 
+ * The following urls will be specific to your own server configuration and will fail  
+ * if used "out of the box". To test root-relative and fully qualifed url's you will 
+ * need to adjust the paths below:
+ */
 
-#import-screen {
-	background: #c00;
-}
+@import url("/selectivizr-git/tests/master/css/min-import-url-root-relative-path.css");.minified{background:url("css/nested/test.png");}
+@import url("http://iis/selectivizr-git/tests/master/css/min-import-url-fully-qualified-path.css");.minified{background:url("css/nested/test.png");}
+@import url("//iis/selectivizr-git/tests/master/css/min-import-url-protocol-relative-path.css");.minified{background:url("css/nested/test.png");}
+
+@import url("min-import-print.css") print;.minified{background:url("css/nested/test.png");}
+@import url("min-import-screen.css") screen;.minified{background:url("css/nested/test.png");}
 
 body {
 	padding: 10px;

tests/master/css/master.css

@@ -0,0 +1,6 @@
+/* if @media type filtering doesn't work we want this test to fail */
+
+tr#min-import-print { 
+	background: #0c0; 
+}
+

tests/master/css/min-import-print.css

@@ -0,0 +1 @@
+#min-import-quoted-double { background-color: #0c0 }

tests/master/css/min-import-quoted-double.css

@@ -0,0 +1 @@
+#min-import-quoted-single { background-color: #0c0 }

tests/master/css/min-import-quoted-single.css

@@ -0,0 +1,4 @@
+tr#min-import-screen { 
+	background: #0c0; 
+}
+

tests/master/css/min-import-screen.css

@@ -0,0 +1 @@
+#min-import-url-fully-qualfied { background-color: #0c0 }

tests/master/css/min-import-url-fully-qualified-path.css

@@ -0,0 +1,3 @@
+#min-import-url-protocol-relative {
+	background: #0c0;
+}