Moved a bunch of methods out of the jQuery-specific Sizzle code into more-appropriate...

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index 0b5f8d8..24d2841 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -19,31 +19,31 @@ function genFx( type, num ){
 
 jQuery.fn.extend({
        show: function(speed,callback){
-               if ( speed ) {
+               if ( speed !== undefined ) {
                        return this.animate( genFx("show", 3), speed, callback);
                } else {
                        for ( var i = 0, l = this.length; i < l; i++ ){
                                var old = jQuery.data(this[i], "olddisplay");
-                               
+
                                this[i].style.display = old || "";
-                               
+
                                if ( jQuery.css(this[i], "display") === "none" ) {
-                                       var tagName = this[i].tagName, display;
-                                       
-                                       if ( elemdisplay[ tagName ] ) {
-                                               display = elemdisplay[ tagName ];
+                                       var nodeName = this[i].nodeName, display;
+
+                                       if ( elemdisplay[ nodeName ] ) {
+                                               display = elemdisplay[ nodeName ];
                                        } else {
-                                               var elem = jQuery("<" + tagName + " />").appendTo("body");
-                                               
+                                               var elem = jQuery("<" + nodeName + " />").appendTo("body");
+
                                                display = elem.css("display");
                                                if ( display === "none" )
                                                        display = "block";
-                                               
+
                                                elem.remove();
-                                               
-                                               elemdisplay[ tagName ] = display;
+
+                                               elemdisplay[ nodeName ] = display;
                                        }
-                                       
+
                                        jQuery.data(this[i], "olddisplay", display);
                                }
                        }
@@ -53,13 +53,13 @@ jQuery.fn.extend({
                        for ( var i = 0, l = this.length; i < l; i++ ){
                                this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
                        }
-                       
+
                        return this;
                }
        },
 
        hide: function(speed,callback){
-               if ( speed ) {
+               if ( speed !== undefined ) {
                        return this.animate( genFx("hide", 3), speed, callback);
                } else {
                        for ( var i = 0, l = this.length; i < l; i++ ){
@@ -103,12 +103,20 @@ jQuery.fn.extend({
                var optall = jQuery.speed(speed, easing, callback);
 
                return this[ optall.queue === false ? "each" : "queue" ](function(){
-               
+
                        var opt = jQuery.extend({}, optall), p,
                                hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
                                self = this;
-       
+
                        for ( p in prop ) {
+                               var name = p.replace(rdashAlpha, fcamelCase);
+
+                               if ( p !== name ) {
+                                       prop[ name ] = prop[ p ];
+                                       delete prop[ p ];
+                                       p = name;
+                               }
+
                                if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
                                        return opt.complete.call(this);
 
@@ -132,7 +140,7 @@ jQuery.fn.extend({
                                if ( /toggle|show|hide/.test(val) )
                                        e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
                                else {
-                                       var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
+                                       var parts = /^([+-]=)?([\d+-.]+)(.*)$/.exec(val),
                                                start = e.cur(true) || 0;
 
                                        if ( parts ) {
@@ -286,20 +294,8 @@ jQuery.fx.prototype = {
 
                t.elem = this.elem;
 
-               if ( t() && jQuery.timers.push(t) && !timerId ) {
-                       timerId = setInterval(function(){
-                               var timers = jQuery.timers;
-
-                               for ( var i = 0; i < timers.length; i++ )
-                                       if ( !timers[i]() )
-                                               timers.splice(i--, 1);
-
-                               if ( !timers.length ) {
-                                       clearInterval( timerId );
-                                       timerId = undefined;
-                               }
-                       }, 13);
-               }
+               if ( t() && jQuery.timers.push(t) && !timerId )
+                       timerId = setInterval(jQuery.fx.tick, 13);
        },
 
        // Simple 'show' function
@@ -362,7 +358,7 @@ jQuery.fx.prototype = {
                                if ( this.options.hide || this.options.show )
                                        for ( var p in this.options.curAnim )
                                                jQuery.style(this.elem, p, this.options.orig[p]);
-                                       
+
                                // Execute the complete function
                                this.options.complete.call( this.elem );
                        }
@@ -386,12 +382,30 @@ jQuery.fx.prototype = {
 };
 
 jQuery.extend( jQuery.fx, {
+
+       tick:function(){
+               var timers = jQuery.timers;
+
+               for ( var i = 0; i < timers.length; i++ )
+                       if ( !timers[i]() )
+                               timers.splice(i--, 1);
+
+               if ( !timers.length )
+                       jQuery.fx.stop();
+       },
+               
+       stop:function(){
+               clearInterval( timerId );
+               timerId = null;
+       },
+       
        speeds:{
                slow: 600,
                fast: 200,
                // Default speed
                _default: 400
        },
+
        step: {
 
                opacity: function(fx){
@@ -406,3 +420,11 @@ jQuery.extend( jQuery.fx, {
                }
        }
 });
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+       jQuery.expr.filters.animated = function(elem){
+               return jQuery.grep(jQuery.timers, function(fn){
+                       return elem === fn.elem;
+               }).length;
+       };
+}
\ No newline at end of file