core: set version.txt to 1.2.7-pre

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index b9ca81e..ab3fe1a 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -75,7 +75,8 @@ jQuery.fn.extend({
                return this[ optall.queue === false ? "each" : "queue" ](function(){
                
                        var opt = jQuery.extend({}, optall), p,
-                               hidden = this.nodeType != 1 ? false : 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 )
@@ -216,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;
@@ -403,7 +404,7 @@ jQuery.extend( jQuery.fx, {
                slow: 600,
                fast: 200,
                // Default speed
-               def: 400
+               _default: 400
        },
        step: {
                scrollLeft: function(fx){