Make sure that jQuery works even when the individual modules are loaded separately...

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index c562d03..65b9e0f 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -1,6 +1,8 @@
+(function( jQuery ) {
+
 var elemdisplay = {},
        rfxtypes = /toggle|show|hide/,
-       rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+       rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
        timerId,
        fxAttrs = [
                // height animations
@@ -13,11 +15,11 @@ var elemdisplay = {},
 
 jQuery.fn.extend({
        show: function( speed, callback ) {
-               if ( speed != null ) {
+               if ( speed || speed === 0) {
                        return this.animate( genFx("show", 3), speed, callback);
 
                } else {
-                       for ( var i = 0, l = this.length; i < l; i++ ){
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
                                var old = jQuery.data(this[i], "olddisplay");
 
                                this[i].style.display = old || "";
@@ -48,7 +50,7 @@ jQuery.fn.extend({
 
                        // Set the display of the elements in a second loop
                        // to avoid the constant reflow
-                       for ( var j = 0, k = this.length; j < k; j++ ){
+                       for ( var j = 0, k = this.length; j < k; j++ ) {
                                this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
                        }
 
@@ -57,20 +59,20 @@ jQuery.fn.extend({
        },
 
        hide: function( speed, callback ) {
-               if ( speed != null ) {
+               if ( speed || speed === 0 ) {
                        return this.animate( genFx("hide", 3), speed, callback);
 
                } else {
-                       for ( var i = 0, l = this.length; i < l; i++ ){
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
                                var old = jQuery.data(this[i], "olddisplay");
-                               if ( !old && old !== "none" ){
+                               if ( !old && old !== "none" ) {
                                        jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
                                }
                        }
 
                        // Set the display of the elements in a second loop
                        // to avoid the constant reflow
-                       for ( var j = 0, k = this.length; j < k; j++ ){
+                       for ( var j = 0, k = this.length; j < k; j++ ) {
                                this[j].style.display = "none";
                        }
 
@@ -88,7 +90,7 @@ jQuery.fn.extend({
                        this._toggle.apply( this, arguments );
 
                } else if ( fn == null || bool ) {
-                       this.each(function(){
+                       this.each(function() {
                                var state = bool ? fn : jQuery(this).is(":hidden");
                                jQuery(this)[ state ? "show" : "hide" ]();
                        });
@@ -108,6 +110,10 @@ jQuery.fn.extend({
        animate: function( prop, speed, easing, callback ) {
                var optall = jQuery.speed(speed, easing, callback);
 
+               if ( jQuery.isEmptyObject( prop ) ) {
+                       return this.each( optall.complete );
+               }
+
                return this[ optall.queue === false ? "each" : "queue" ](function() {
                        var opt = jQuery.extend({}, optall), p,
                                hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
@@ -181,23 +187,19 @@ jQuery.fn.extend({
                                }
                        });
 
-                       if ( jQuery.isEmptyObject( prop ) ) {
-                               return optall.complete.call(this);
-                       }
-
                        // For JS strict compliance
                        return true;
                });
        },
 
-       stop: function(clearQueue, gotoEnd){
+       stop: function( clearQueue, gotoEnd ) {
                var timers = jQuery.timers;
 
                if ( clearQueue ) {
                        this.queue([]);
                }
 
-               this.each(function(){
+               this.each(function() {
                        // go in reverse order so anything added to the queue during the loop is ignored
                        for ( var i = timers.length - 1; i >= 0; i-- ) {
                                if ( timers[i].elem === this ) {
@@ -221,6 +223,16 @@ jQuery.fn.extend({
 
 });
 
+function genFx( type, num ) {
+       var obj = {};
+
+       jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+               obj[ this ] = type;
+       });
+
+       return obj;
+}
+
 // Generate shortcuts for custom animations
 jQuery.each({
        slideDown: genFx("show", 1),
@@ -228,8 +240,8 @@ jQuery.each({
        slideToggle: genFx("toggle", 1),
        fadeIn: { opacity: "show" },
        fadeOut: { opacity: "hide" }
-}, function( name, props ){
-       jQuery.fn[ name ] = function( speed, callback ){
+}, function( name, props ) {
+       jQuery.fn[ name ] = function( speed, callback ) {
                return this.animate( props, speed, callback );
        };
 });
@@ -248,7 +260,7 @@ jQuery.extend({
 
                // Queueing
                opt.old = opt.complete;
-               opt.complete = function(){
+               opt.complete = function() {
                        if ( opt.queue !== false ) {
                                jQuery(this).dequeue();
                        }
@@ -310,7 +322,7 @@ jQuery.fx.prototype = {
 
        // Start an animation from one number to another
        custom: function( from, to, unit ) {
-               this.startTime = now();
+               this.startTime = jQuery.now();
                this.start = from;
                this.end = to;
                this.unit = unit || this.unit || "px";
@@ -356,7 +368,7 @@ jQuery.fx.prototype = {
 
        // Each step of an animation
        step: function( gotoEnd ) {
-               var t = now(), done = true;
+               var t = jQuery.now(), done = true;
 
                if ( gotoEnd || t >= this.options.duration + this.startTime ) {
                        this.now = this.end;
@@ -443,9 +455,9 @@ jQuery.extend( jQuery.fx, {
        
        speeds: {
                slow: 600,
-               fast: 200,
-               // Default speed
-               _default: 400
+               fast: 200,
+               // Default speed
+               _default: 400
        },
 
        step: {
@@ -464,19 +476,11 @@ jQuery.extend( jQuery.fx, {
 });
 
 if ( jQuery.expr && jQuery.expr.filters ) {
-       jQuery.expr.filters.animated = function(elem){
-               return jQuery.grep(jQuery.timers, function(fn){
+       jQuery.expr.filters.animated = function( elem ) {
+               return jQuery.grep(jQuery.timers, function( fn ) {
                        return elem === fn.elem;
                }).length;
        };
 }
 
-function genFx( type, num ) {
-       var obj = {};
-
-       jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
-               obj[ this ] = type;
-       });
-
-       return obj;
-}
+})( jQuery );