X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Feffects.js;h=bd57ffc3daf2f220e5f96a195dad4634ac803860;hp=f9c682c9f4e5f5dd0937806228ab93c25e59e293;hb=78be517727674d1e0a208e3e144eac8840d653e7;hpb=118c8c4600b62d6de2b0248ae27626da74dcf5b2 diff --git a/src/effects.js b/src/effects.js index f9c682c..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 @@ -60,12 +60,11 @@ jQuery.fn.extend({ } else { for ( var i = 0, j = this.length; i < j; i++ ) { - var display = jQuery.css( this[i], "display" ), - old = jQuery.data( this[i], "olddisplay" ); - - if ( !old && display !== "none" ) { - jQuery.data( this[i], "olddisplay", display ); - } + var display = jQuery.css( this[i], "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 @@ -338,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