Skip to content

Commit

Permalink
Merge remote branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanseddon committed Jan 23, 2011
2 parents 4f126e9 + 3bed792 commit 01f3642
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
2 changes: 1 addition & 1 deletion modernizr.js
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ window.Modernizr = (function(window,document,undefined){
* Reset m.style.cssText to nothing to reduce memory footprint.
*/
set_css( '' );
modElem = f = null;
modElem = inputElem = null;

// Enable HTML 5 elements for styling in IE.
// fyi: jscript version does not reflect trident version
Expand Down
26 changes: 1 addition & 25 deletions test/unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,31 +241,7 @@ test('Modernizr.audio and Modernizr.video',function(){
}


})

asyncTest('async @font-face test',4,function(){

// we do this to verify our callback indeed will run.
start();
ok(Modernizr._fontfaceready,'passing a method to Modernizr._fontfaceready')
stop();

Modernizr._fontfaceready(function(bool){

ok(bool === true || bool === false,'passed argument is a boolean');
equals(bool,Modernizr.fontface,'Modernizr prop matches passed arg');

var expectedclass = (Modernizr.fontface ? '' : 'no-') + 'fontface';

ok(document.documentElement.className.indexOf(' '+expectedclass) >= 0,
'correct class added to documentElement');


start();
});


})
});


test('Modernizr results match expected values',function(){
Expand Down

0 comments on commit 01f3642

Please sign in to comment.