Permalink
Browse files

fixing up again after a merge conflict.

  • Loading branch information...
1 parent d6e6585 commit 270c23c85321483b100cc448ec4c626ca146f679 Scott Jehl committed Jan 17, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 respond.min.js
  2. +2 −2 respond.src.js
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -55,7 +55,7 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
//if media queries are supported, exit here
if( respond.mediaQueriesSupported ){
- return;
+ //return;
}
@stof

stof Jan 21, 2013

why commenting the early return for browsers supporting media queries ?

@scottjehl

scottjehl via email Jan 21, 2013

Owner
//define vars
@@ -270,7 +270,7 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
for( var k in styleBlocks ){
if( styleBlocks.hasOwnProperty( k ) ){
var ss = doc.createElement( "style" ),
- css = styleBlocks[ i ].join( "\n" );
+ css = styleBlocks[ k ].join( "\n" );
ss.type = "text/css";
ss.media = k;

0 comments on commit 270c23c

Please sign in to comment.