X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=60070742764c5801ab716b243756a587319cf527;hb=37d297c67fe3569a5a9d81586e14d4a887df7879;hp=f9c682c9f4e5f5dd0937806228ab93c25e59e293;hpb=118c8c4600b62d6de2b0248ae27626da74dcf5b2;p=jquery.git diff --git a/src/effects.js b/src/effects.js index f9c682c..6007074 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" ); + var display = jQuery.css( this[i], "display" ); - if ( !old && display !== "none" ) { - 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