decoupling styles retrieval from the attr method

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index 626227d..0b5f8d8 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -1,11 +1,26 @@
-var elemdisplay = {};
+var elemdisplay = {},
+       timerId,
+       fxAttrs = [
+               // height animations
+               [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+               // width animations
+               [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+               // opacity animations
+               [ "opacity" ]
+       ];
+
+function genFx( type, num ){
+       var obj = {};
+       jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
+               obj[ this ] = type;
+       });
+       return obj;
+}
 
 jQuery.fn.extend({
        show: function(speed,callback){
                if ( speed ) {
-                       return this.animate({
-                               height: "show", width: "show", opacity: "show"
-                       }, speed, callback);
+                       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");
@@ -29,9 +44,15 @@ jQuery.fn.extend({
                                                elemdisplay[ tagName ] = display;
                                        }
                                        
-                                       this[i].style.display = jQuery.data(this[i], "olddisplay", display);
+                                       jQuery.data(this[i], "olddisplay", display);
                                }
                        }
+
+                       // Set the display of the elements in a second loop
+                       // to avoid the constant reflow
+                       for ( var i = 0, l = this.length; i < l; i++ ){
+                               this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
+                       }
                        
                        return this;
                }
@@ -39,16 +60,20 @@ jQuery.fn.extend({
 
        hide: function(speed,callback){
                if ( speed ) {
-                       return this.animate({
-                               height: "hide", width: "hide", opacity: "hide"
-                       }, speed, callback);
+                       return this.animate( genFx("hide", 3), speed, callback);
                } else {
                        for ( var i = 0, l = this.length; i < l; i++ ){
                                var old = jQuery.data(this[i], "olddisplay");
                                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 i = 0, l = this.length; i < l; i++ ){
                                this[i].style.display = "none";
                        }
+
                        return this;
                }
        },
@@ -66,13 +91,12 @@ jQuery.fn.extend({
                                        var state = bool ? fn : jQuery(this).is(":hidden");
                                        jQuery(this)[ state ? "show" : "hide" ]();
                                }) :
-                               this.animate({
-                                       height: "toggle", width: "toggle", opacity: "toggle"
-                               }, fn, fn2);
+                               this.animate(genFx("toggle", 3), fn, fn2);
        },
 
        fadeTo: function(speed,to,callback){
-               return this.animate({opacity: to}, speed, callback);
+               return this.filter(":hidden").css('opacity', 0).show().end()
+                                       .animate({opacity: to}, speed, callback);
        },
 
        animate: function( prop, speed, easing, callback ) {
@@ -165,9 +189,9 @@ jQuery.fn.extend({
 
 // Generate shortcuts for custom animations
 jQuery.each({
-       slideDown: { height:"show" },
-       slideUp: { height: "hide" },
-       slideToggle: { height: "toggle" },
+       slideDown: genFx("show", 1),
+       slideUp: genFx("hide", 1),
+       slideToggle: genFx("toggle", 1),
        fadeIn: { opacity: "show" },
        fadeOut: { opacity: "hide" }
 }, function( name, props ){
@@ -211,7 +235,6 @@ jQuery.extend({
        },
 
        timers: [],
-       timerId: null,
 
        fx: function( elem, options, prop ){
                this.options = options;
@@ -263,10 +286,8 @@ jQuery.fx.prototype = {
 
                t.elem = this.elem;
 
-               jQuery.timers.push(t);
-
-               if ( t() && jQuery.timerId == null ) {
-                       jQuery.timerId = setInterval(function(){
+               if ( t() && jQuery.timers.push(t) && !timerId ) {
+                       timerId = setInterval(function(){
                                var timers = jQuery.timers;
 
                                for ( var i = 0; i < timers.length; i++ )
@@ -274,8 +295,8 @@ jQuery.fx.prototype = {
                                                timers.splice(i--, 1);
 
                                if ( !timers.length ) {
-                                       clearInterval( jQuery.timerId );
-                                       jQuery.timerId = null;
+                                       clearInterval( timerId );
+                                       timerId = undefined;
                                }
                        }, 13);
                }
@@ -284,7 +305,7 @@ jQuery.fx.prototype = {
        // Simple 'show' function
        show: function(){
                // Remember where we started, so that we can go back to it later
-               this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+               this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
                this.options.show = true;
 
                // Begin the animation
@@ -299,7 +320,7 @@ jQuery.fx.prototype = {
        // Simple 'hide' function
        hide: function(){
                // Remember where we started, so that we can go back to it later
-               this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+               this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
                this.options.hide = true;
 
                // Begin the animation
@@ -340,12 +361,11 @@ jQuery.fx.prototype = {
                                // Reset the properties, if the item has been hidden or shown
                                if ( this.options.hide || this.options.show )
                                        for ( var p in this.options.curAnim )
-                                               jQuery.attr(this.elem.style, p, this.options.orig[p]);
-                       }
-
-                       if ( done )
+                                               jQuery.style(this.elem, p, this.options.orig[p]);
+                                       
                                // Execute the complete function
                                this.options.complete.call( this.elem );
+                       }
 
                        return false;
                } else {
@@ -375,7 +395,7 @@ jQuery.extend( jQuery.fx, {
        step: {
 
                opacity: function(fx){
-                       jQuery.attr(fx.elem.style, "opacity", fx.now);
+                       jQuery.style(fx.elem, "opacity", fx.now);
                },
 
                _default: function(fx){