jquery ajax: renamed $.fx.speeds.def to _default to match $.fx.step._default naming...

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index 116711f..ab3fe1a 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -73,12 +73,11 @@ jQuery.fn.extend({
                var optall = jQuery.speed(speed, easing, callback);
 
                return this[ optall.queue === false ? "each" : "queue" ](function(){
-                       if ( this.nodeType != 1)
-                               return false;
-
+               
                        var opt = jQuery.extend({}, optall), p,
-                               hidden = jQuery(this).is(":hidden"), self = this;
-
+                               hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
+                               self = this;
+       
                        for ( p in prop ) {
                                if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
                                        return opt.complete.call(this);
@@ -218,7 +217,7 @@ jQuery.extend({
 
                opt.duration = (opt.duration && opt.duration.constructor == Number ?
                        opt.duration :
-                       jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
+                       jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds._default;
 
                // Queueing
                opt.old = opt.complete;
@@ -271,7 +270,7 @@ jQuery.fx.prototype = {
 
        // Get the current size
        cur: function(force){
-               if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
+               if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) )
                        return this.elem[ this.prop ];
 
                var r = parseFloat(jQuery.css(this.elem, this.prop, force));
@@ -378,7 +377,6 @@ jQuery.fx.prototype = {
                                                jQuery.attr(this.elem.style, p, this.options.orig[p]);
                        }
 
-                       // If a callback was provided, execute it
                        if ( done )
                                // Execute the complete function
                                this.options.complete.call( this.elem );
@@ -406,7 +404,7 @@ jQuery.extend( jQuery.fx, {
                slow: 600,
                fast: 200,
                // Default speed
-               def: 400
+               _default: 400
        },
        step: {
                scrollLeft: function(fx){
@@ -422,7 +420,7 @@ jQuery.extend( jQuery.fx, {
                },
 
                _default: function(fx){
-                       fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+                       ( fx.elem.style && ( fx.elem.style[ fx.prop ] = fx.now + fx.unit ) ) || ( fx.elem[ fx.prop ] = fx.now );
                }
        }
 });