On Firefox, with hidden iframes, matchMedia returns null, thus trying to

access .matches crashes things. Added extra check to make sure we stay up and running. Also, added .project to gitignore
bholley · Mar 28, 2013 · 3a4f0a3 · 3a4f0a3
1 parent af5f597
commit 3a4f0a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ build
 dist
 tmp
 .DS_Store
+.project
diff --git a/src/testMediaQuery.js b/src/testMediaQuery.js
@@ -6,7 +6,7 @@ define(['injectElementWithStyles'], function( injectElementWithStyles ) {
     var matchMedia = window.matchMedia || window.msMatchMedia;
     var bool;
     if ( matchMedia ) {
-      return matchMedia(mq).matches;
+      return matchMedia(mq) && matchMedia(mq).matches || false;
     }
 
     injectElementWithStyles('@media ' + mq + ' { #modernizr { position: absolute; } }', function( node ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ build @@
     dist
     tmp
     .DS_Store
+    .project