X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=bd57ffc3daf2f220e5f96a195dad4634ac803860;hb=c43b078c6911027fd4124d542446ad0098662f6a;hp=51ce0c5772c54dcf6a1e94fc657c917ccbbf06c3;hpb=86cf820d36341842e10084a97d2ecf87393336f3;p=jquery.git

diff --git a/src/effects.js b/src/effects.js
index 51ce0c5..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
@@ -62,7 +62,7 @@ jQuery.fn.extend({
 			for ( var i = 0, j = this.length; i < j; i++ ) {
 				var display = jQuery.css( this[i], "display" );
 
-				if ( display !== "none" ) {
+				if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
 					jQuery.data( this[i], "olddisplay", display );
 				}
 			}
@@ -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