Added a fix for Safari's broken CSS getComputedStyle accessing. Additionally, added...

[jquery.git] / src / fx / fx.js

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 4c38413..3ad3dd5 100644 (file)
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -376,7 +376,7 @@ jQuery.extend({
                        complete: fn || !fn && easing || 
                                jQuery.isFunction( speed ) && speed,
                        duration: speed,
-                       easing: fn && easing || easing && easing.constructor != Function && easing || (jQuery.easing.swing ? "swing" : "linear")
+                       easing: fn && easing || easing && easing.constructor != Function && easing
                };
 
                opt.duration = (opt.duration && opt.duration.constructor == Number ? 
@@ -443,7 +443,10 @@ jQuery.extend({
                                jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
                        else {
                                y[prop] = parseInt(z.now) + "px";
-                               y.display = "block"; // Set display property to block for animation
+
+                               // Set display property to block for height/width animations
+                               if ( prop == "height" || prop == "width" )
+                                       y.display = "block";
                        }
                };
 
@@ -564,7 +567,7 @@ jQuery.extend({
                                var p = n / options.duration;
                                
                                // Perform the easing function, defaults to swing
-                               z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration);
+                               z.now = jQuery.easing[options.easing || (jQuery.easing.swing ? "swing" : "linear")](p, n, firstNum, (lastNum-firstNum), options.duration);
 
                                // Perform the next step of the animation
                                z.a();