made the expressions a bit more leanient on whitespace. Fixes #16

scottjehl · Apr 19, 2011 · 79f232a · 79f232a
1 parent 266da29
commit 79f232a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/respond.min.js b/respond.min.js
diff --git a/respond.src.js b/respond.src.js
@@ -73,7 +73,7 @@
 
 		//find media blocks in css text, convert to style blocks
 		translate		= function( styles, href, media ){
-			var qs		= styles.match( /@media ([^\{]+)\{([\S\s]+?)(?=\}\/\*\/mediaquery\*\/)/gmi ),
+			var qs		= styles.match( /@media ([^\{]+)\{([\S\s]+?)(?=\}[\s]*\/\*\/mediaquery\*\/)/gmi ),
 				ql		= qs && qs.length || 0,
 				//try to get CSS path
 				href	= href.substring( 0, href.lastIndexOf( "/" )),
@@ -116,8 +116,8 @@
 					mediastyles.push( { 
 						media	: thisq.match( /(only\s+)?([a-zA-Z]+)(\sand)?/ ) && RegExp.$2,
 						rules	: rules.length - 1,
-						minw	: thisq.match( /\(min\-width:\s?(\s?[0-9]+)px\s?\)/ ) && parseFloat( RegExp.$1 ), 
+						minw	: thisq.match( /\(min\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/ ) && parseFloat( RegExp.$1 ), 
-						maxw	: thisq.match( /\(max\-width:\s?(\s?[0-9]+)px\s?\)/ ) && parseFloat( RegExp.$1 )
+						maxw	: thisq.match( /\(max\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/ ) && parseFloat( RegExp.$1 )
 					} );
 				}	
 			}

diff --git a/test/test.css b/test/test.css
@@ -32,7 +32,9 @@ a {
 	body {
 		background: green;
 	}
-}/*/mediaquery*/
+}
+
+/*/mediaquery*/
 
 /*styles for 620px and up!*/
 @media screen and (min-width: 620px), only print, projector {