X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=60070742764c5801ab716b243756a587319cf527;hb=f28c774f2cde004a33aefc28306d995c599d963b;hp=bac2e1d51393c8d9838b648055b862aa20ee7c4e;hpb=795e880bba1f7f949df58748f7fd92e50296a8f4;p=jquery.git

diff --git a/src/effects.js b/src/effects.js
index bac2e1d..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
@@ -62,9 +62,9 @@ jQuery.fn.extend({
 			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