var elemdisplay = {},
- fxHeight = [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
- fxWidth = [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
- fxOpacity = [ "opacity" ];
-
-function genFx( type, width, height, extra ){
+ 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(width.concat( height || [], extra || []), function(){
+ 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( genFx("show", fxHeight, fxWidth, fxOpacity), 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");
-
+
this[i].style.display = old || "";
-
+
if ( jQuery.css(this[i], "display") === "none" ) {
var tagName = this[i].tagName, display;
-
+
if ( elemdisplay[ tagName ] ) {
display = elemdisplay[ tagName ];
} else {
var elem = jQuery("<" + tagName + " />").appendTo("body");
-
+
display = elem.css("display");
if ( display === "none" )
display = "block";
-
+
elem.remove();
-
+
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;
}
},
hide: function(speed,callback){
if ( speed ) {
- return this.animate( genFx("hide", fxHeight, fxWidth, fxOpacity), 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;
}
},
var state = bool ? fn : jQuery(this).is(":hidden");
jQuery(this)[ state ? "show" : "hide" ]();
}) :
- this.animate(genFx("toggle", fxHeight, fxWidth, fxOpacity), 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 ) {
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 ) {
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return opt.complete.call(this);
// Generate shortcuts for custom animations
jQuery.each({
- slideDown: genFx("show", fxHeight),
- slideUp: genFx("hide", fxHeight),
- slideToggle: genFx("toggle", fxHeight),
+ slideDown: genFx("show", 1),
+ slideUp: genFx("hide", 1),
+ slideToggle: genFx("toggle", 1),
fadeIn: { opacity: "show" },
fadeOut: { opacity: "hide" }
}, function( name, props ){
},
timers: [],
- timerId: null,
fx: function( elem, options, prop ){
this.options = options;
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++ )
timers.splice(i--, 1);
if ( !timers.length ) {
- clearInterval( jQuery.timerId );
- jQuery.timerId = null;
+ clearInterval( timerId );
+ timerId = undefined;
}
}, 13);
}
// 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
// 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
// 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]);
- }
+ jQuery.style(this.elem, p, this.options.orig[p]);
- if ( done )
// Execute the complete function
this.options.complete.call( this.elem );
+ }
return false;
} else {
step: {
opacity: function(fx){
- jQuery.attr(fx.elem.style, "opacity", fx.now);
+ jQuery.style(fx.elem, "opacity", fx.now);
},
_default: function(fx){