Moved unload abort code so that the event is only bound if the xhr transport is used...

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index f9c682c..bd57ffc 100644 (file)
--- 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