X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=bd57ffc3daf2f220e5f96a195dad4634ac803860;hb=c43b078c6911027fd4124d542446ad0098662f6a;hp=f976c41a57c53bea9d81970ee88beec7156bdbb5;hpb=5b2408147b9cf9b7f49a07ebe97b20c398568e22;p=jquery.git diff --git a/src/effects.js b/src/effects.js index f976c41..bd57ffc 100644 --- a/src/effects.js +++ b/src/effects.js @@ -2,7 +2,7 @@ var elemdisplay = {}, rfxtypes = /^(?:toggle|show|hide)$/, - rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/, + rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i, timerId, fxAttrs = [ // height animations @@ -61,10 +61,10 @@ jQuery.fn.extend({ } else { for ( var i = 0, j = this.length; i < j; i++ ) { var display = jQuery.css( this[i], "display" ); - - if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) { - jQuery.data( this[i], "olddisplay", display ); - } + + if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) { + jQuery.data( this[i], "olddisplay", display ); + } } // Set the display of the elements in a second loop @@ -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