Skip to content

Commit

Permalink
Update QUnit, fix visibility of #dl and pass JSLint in effects.js
Browse files Browse the repository at this point in the history
  • Loading branch information
timmywil committed Apr 17, 2011
1 parent ecf6a3c commit 68cc3ad
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
44 changes: 22 additions & 22 deletions src/effects.js
Expand Up @@ -165,7 +165,7 @@ jQuery.fn.extend({
this.style.display = "inline-block";

} else {
var display = defaultDisplay(this.nodeName);
display = defaultDisplay(this.nodeName);

This comment has been minimized.

Copy link
@rwaldron

rwaldron Apr 17, 2011

Member

If I'm not mistaken, there is no display var declared prior to this

This comment has been minimized.

Copy link
@timmywil

timmywil Apr 17, 2011

Member

I see it declared in the vars outside this for loop. JSLint was complaining.

This comment has been minimized.

Copy link
@dmethvin

dmethvin Apr 17, 2011

Member

You dare to challenge the jslint?


// inline-level elements accept inline-block;
// block-level elements need to be inline with layout
Expand Down Expand Up @@ -266,6 +266,27 @@ jQuery.fn.extend({

});

// Animations created synchronously will run synchronously
function createFxNow() {
setTimeout( clearFxNow, 0 );
return ( fxNow = jQuery.now() );
}

function clearFxNow() {
fxNow = undefined;
}

// Generate parameters to create a standard animation
function genFx( type, num ) {
var obj = {};

jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
obj[ this ] = type;
});

return obj;
}

// Generate shortcuts for custom animations
jQuery.each({
slideDown: genFx("show", 1),
Expand Down Expand Up @@ -581,25 +602,4 @@ function defaultDisplay( nodeName ) {
return elemdisplay[ nodeName ];
}

// Animations created synchronously will run synchronously
function createFxNow() {
setTimeout( clearFxNow, 0 );
return ( fxNow = jQuery.now() );
}

function clearFxNow() {
fxNow = undefined;
}

// Generate parameters to create a standard animation
function genFx( type, num ) {
var obj = {};

jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
obj[ this ] = type;
});

return obj;
}

})( jQuery );
2 changes: 1 addition & 1 deletion test/index.html
Expand Up @@ -60,7 +60,7 @@ <h2 id="qunit-userAgent"></h2>
</div>
<!-- this iframe is outside the #qunit-fixture so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves -->
<iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe>
<dl id="dl" style="position:absolute;top:-32767px;left:-32767px;">
<dl id="dl" style="position:absolute;top:-32767px;left:-32767px;width:1px">
<div id="qunit-fixture">
<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
<p id="ap">
Expand Down
2 changes: 1 addition & 1 deletion test/qunit
Submodule qunit updated from d404fa to 69925b

0 comments on commit 68cc3ad

Please sign in to comment.