X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=5f3a035fcaab2d38ccb2a01f68481cc872220a7a;hb=3e0cc815043c2425819743e907a0ce263a7ce164;hp=bac2e1d51393c8d9838b648055b862aa20ee7c4e;hpb=8f2667f4c09d14de413cac1e3c5fc5783521b0e0;p=jquery.git diff --git a/src/effects.js b/src/effects.js index bac2e1d..5f3a035 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 ( !jQuery.data( this[i], "olddisplay" ) && 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