Make jQuery work without warnings in strict mode, in Firefox.

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

diff --git a/src/fx/fx.js b/src/fx/fx.js
index af89e93..9f767a9 100644 (file)
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -110,9 +110,13 @@ jQuery.fn.extend({
        toggle: function( fn, fn2 ){
                return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
                        this._toggle( fn, fn2 ) :
-                       this.animate({
-                               height: "toggle", width: "toggle", opacity: "toggle"
-                       }, fn, fn2);
+                       fn ?
+                               this.animate({
+                                       height: "toggle", width: "toggle", opacity: "toggle"
+                               }, fn, fn2) :
+                               this.each(function(){
+                                       jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+                               });
        },
        
        /**
@@ -307,16 +311,27 @@ jQuery.fn.extend({
         */
        animate: function( prop, speed, easing, callback ) {
                return this.queue(function(){
-                       var hidden = jQuery(this).is(":hidden");
+                       var hidden = jQuery(this).is(":hidden"),
+                               opt = jQuery.speed(speed, easing, callback),
+                               self = this;
                        
-                       for ( var p in prop )
-                               if ( prop[p] == "hide" && hidden ||
-                                       prop[p] == "show" && !hidden )
-                                               return;
-               
+                       for ( var p in prop ) {
+                               if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+                                       return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+
+                               if ( p == "height" || p == "width" ) {
+                                       // Store display property
+                                       opt.display = jQuery.css(this, "display");
+
+                                       // Make sure that nothing sneaks out
+                                       opt.overflow = this.style.overflow;
+                               }
+                       }
+
+                       if ( opt.overflow != null )
+                               this.style.overflow = "hidden";
+
                        this.curAnim = jQuery.extend({}, prop);
-                       var opt = jQuery.speed(speed, easing, callback);
-                       var self = this;
                        
                        jQuery.each( prop, function(name, val){
                                var e = new jQuery.fx( self, opt, name );
@@ -325,6 +340,9 @@ jQuery.fn.extend({
                                else
                                        e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
                        });
+
+                       // For JS strict compliance
+                       return true;
                });
        },
        
@@ -361,7 +379,7 @@ jQuery.extend({
                        complete: fn || !fn && easing || 
                                jQuery.isFunction( speed ) && speed,
                        duration: speed,
-                       easing: fn && easing || easing && easing.constructor != Function && easing || "swing"
+                       easing: fn && easing || easing && easing.constructor != Function && easing
                };
 
                opt.duration = (opt.duration && opt.duration.constructor == Number ? 
@@ -419,15 +437,6 @@ jQuery.extend({
                // The styles
                var y = elem.style;
                
-               if ( prop == "height" || prop == "width" ) {
-                       // Store display property
-                       var oldDisplay = jQuery.css(elem, "display");
-
-                       // Make sure that nothing sneaks out
-                       var oldOverflow = y.overflow;
-                       y.overflow = "hidden";
-               }
-
                // Simple function for setting a style value
                z.a = function(){
                        if ( options.step )
@@ -437,7 +446,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";
                        }
                };
 
@@ -526,12 +538,12 @@ jQuery.extend({
                                                done = false;
 
                                if ( done ) {
-                                       if ( oldDisplay != null ) {
+                                       if ( options.display != null ) {
                                                // Reset the overflow
-                                               y.overflow = oldOverflow;
+                                               y.overflow = options.overflow;
                                        
                                                // Reset the display
-                                               y.display = oldDisplay;
+                                               y.display = options.display;
                                                if ( jQuery.css(elem, "display") == "none" )
                                                        y.display = "block";
                                        }
@@ -558,7 +570,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();