Fixes #179 (including tests)

scottjehl · Nov 25, 2013 · 583ee45 · 583ee45
1 parent 5487dff
commit 583ee45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/respond.js b/src/respond.js
@@ -55,8 +55,8 @@
 		urls: /(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,
 		findStyles: /@media *([^\{]+)\{([\S\s]+?)$/,
 		only: /(only\s+)?([a-zA-Z]+)\s?/,
-		minw: /\(min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,
-		maxw: /\(max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/
+		minw: /\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,
+		maxw: /\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/
 	};
 
 	//expose media query support flag for external use

diff --git a/test/unit/tests.js b/test/unit/tests.js
@@ -166,6 +166,18 @@ window.onload = function(){
 					});
 			});
 		});
+
+		test( 'Test spaces around min-width/max-width', function() {
+			ok( '@media only screen and (min-width: 1px) { }'.match( respond.regex.maxw ) === null );
+			ok( '@media only screen and ( min-width: 1px ) { }'.match( respond.regex.maxw ) === null );
+			ok( '@media only screen and (min-width: 1px) { }'.match( respond.regex.minw ).length );
+			ok( '@media only screen and ( min-width: 1px ) { }'.match( respond.regex.minw ).length );
+
+			ok( '@media only screen and (max-width: 1280px) { }'.match( respond.regex.minw ) === null );
+			ok( '@media only screen and ( max-width: 1280px ) { }'.match( respond.regex.minw ) === null );
+			ok( '@media only screen and (max-width: 1280px) { }'.match( respond.regex.maxw ).length );
+			ok( '@media only screen and ( max-width: 1280px ) { }'.match( respond.regex.maxw ).length );
+		});
 	}
 
 };