X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=bd57ffc3daf2f220e5f96a195dad4634ac803860;hb=c43b078c6911027fd4124d542446ad0098662f6a;hp=067383bc41d827a5c67d0a8fdb6188b874acdb1e;hpb=796d25cf07ad63e2008ff4b70db182d33a3533dd;p=jquery.git diff --git a/src/effects.js b/src/effects.js index 067383b..bd57ffc 100644 --- a/src/effects.js +++ b/src/effects.js @@ -62,7 +62,7 @@ jQuery.fn.extend({ for ( var i = 0, j = this.length; i < j; i++ ) { var display = jQuery.css( this[i], "display" ); - if ( display !== "none" ) { + if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) { jQuery.data( this[i], "olddisplay", display ); } } @@ -337,7 +337,7 @@ jQuery.fx.prototype = { } var r = parseFloat( jQuery.css( this.elem, this.prop ) ); - return r && r > -10000 ? r : 0; + return r || 0; }, // Start an animation from one number to another