X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=4c38413ef374b5fee88b1fa43fba83b6a845ae17;hb=c4eddea7c3adfddc79a6b43de69f0b31cff980d0;hp=0c57ef450792c26d6ec3a6eaade8108bdc41ed0d;hpb=1b9f4d3d2e1bc2dfd7572da77159fa01f9ab5d6e;p=jquery.git diff --git a/src/fx/fx.js b/src/fx/fx.js index 0c57ef4..4c38413 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -33,18 +33,16 @@ jQuery.fn.extend({ * @see hide(String|Number,Function) */ show: function(speed,callback){ - var hidden = this.filter(":hidden"); - speed ? - hidden.animate({ + return speed ? + this.animate({ height: "show", width: "show", opacity: "show" }, speed, callback) : - hidden.each(function(){ + this.filter(":hidden").each(function(){ this.style.display = this.oldblock ? this.oldblock : ""; if ( jQuery.css(this,"display") == "none" ) this.style.display = "block"; - }); - return this; + }).end(); }, /** @@ -80,19 +78,17 @@ jQuery.fn.extend({ * @see show(String|Number,Function) */ hide: function(speed,callback){ - var visible = this.filter(":visible"); - speed ? - visible.animate({ + return speed ? + this.animate({ height: "hide", width: "hide", opacity: "hide" }, speed, callback) : - visible.each(function(){ + this.filter(":visible").each(function(){ this.oldblock = this.oldblock || jQuery.css(this,"display"); if ( this.oldblock == "none" ) this.oldblock = "block"; this.style.display = "none"; - }); - return this; + }).end(); }, // Save the old toggle function @@ -112,13 +108,15 @@ jQuery.fn.extend({ * @cat Effects */ toggle: function( fn, fn2 ){ - var args = arguments; return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? this._toggle( fn, fn2 ) : - this.each(function(){ - jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ] - .apply( jQuery(this), args ); - }); + fn ? + this.animate({ + height: "toggle", width: "toggle", opacity: "toggle" + }, fn, fn2) : + this.each(function(){ + jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); + }); }, /** @@ -143,7 +141,7 @@ jQuery.fn.extend({ * @see slideToggle(String|Number,Function) */ slideDown: function(speed,callback){ - return this.filter(":hidden").animate({height: "show"}, speed, callback).end(); + return this.animate({height: "show"}, speed, callback); }, /** @@ -168,7 +166,7 @@ jQuery.fn.extend({ * @see slideToggle(String|Number,Function) */ slideUp: function(speed,callback){ - return this.filter(":visible").animate({height: "hide"}, speed, callback).end(); + return this.animate({height: "hide"}, speed, callback); }, /** @@ -193,10 +191,7 @@ jQuery.fn.extend({ * @see slideUp(String|Number,Function) */ slideToggle: function(speed, callback){ - return this.each(function(){ - var state = jQuery(this).is(":hidden") ? "show" : "hide"; - jQuery(this).animate({height: state}, speed, callback); - }); + return this.animate({height: "toggle"}, speed, callback); }, /** @@ -222,7 +217,7 @@ jQuery.fn.extend({ * @see fadeTo(String|Number,Number,Function) */ fadeIn: function(speed, callback){ - return this.filter(":hidden").animate({opacity: "show"}, speed, callback).end(); + return this.animate({opacity: "show"}, speed, callback); }, /** @@ -248,7 +243,7 @@ jQuery.fn.extend({ * @see fadeTo(String|Number,Number,Function) */ fadeOut: function(speed, callback){ - return this.filter(":visible").animate({opacity: "hide"}, speed, callback).end(); + return this.animate({opacity: "hide"}, speed, callback); }, /** @@ -304,30 +299,47 @@ jQuery.fn.extend({ * @example $("p").animate({ * opacity: 'show' * }, "slow", "easein"); - * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only 'linear' is provided by default, with jQuery). + * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only "swing" and "linear" are provided by default, with jQuery). * * @name animate * @type jQuery * @param Hash params A set of style attributes that you wish to animate, and to what end. * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). - * @param String easing (optional) The name of the easing effect that you want to use (e.g. swing or linear). Defaults to "swing". + * @param String easing (optional) The name of the easing effect that you want to use (e.g. "swing" or "linear"). Defaults to "swing". * @param Function callback (optional) A function to be executed whenever the animation completes. * @cat Effects */ animate: function( prop, speed, easing, callback ) { return this.queue(function(){ - - this.curAnim = jQuery.extend({}, prop); - var opt = jQuery.speed(speed, easing, callback); + var hidden = jQuery(this).is(":hidden"), + opt = jQuery.speed(speed, easing, callback), + self = this; for ( var p in prop ) { - var e = new jQuery.fx( this, opt, p ); - if ( prop[p].constructor == Number ) - e.custom( e.cur(), prop[p] ); - else - e[ prop[p] ]( prop ); + if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) + return jQuery.isFunction(opt.complete) && opt.complete.apply(this); + + if ( p == "height" || p == "width" ) { + // Store display property + opt.display = jQuery.css(this, "display"); + + // Make sure that nothing sneaks out + opt.overflow = this.style.overflow; + } } + + if ( opt.overflow != null ) + this.style.overflow = "hidden"; + + this.curAnim = jQuery.extend({}, prop); + jQuery.each( prop, function(name, val){ + var e = new jQuery.fx( self, opt, name ); + if ( val.constructor == Number ) + e.custom( e.cur(), val ); + else + e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); + }); }); }, @@ -364,7 +376,7 @@ jQuery.extend({ complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, - easing: fn && easing || easing && easing.constructor != Function && easing || "swing" + easing: fn && easing || easing && easing.constructor != Function && easing || (jQuery.easing.swing ? "swing" : "linear") }; opt.duration = (opt.duration && opt.duration.constructor == Number ? @@ -422,15 +434,6 @@ jQuery.extend({ // The styles var y = elem.style; - if ( prop == "height" || prop == "width" ) { - // Store display property - var oldDisplay = jQuery.css(elem, "display"); - - // Make sure that nothing sneaks out - var oldOverflow = y.overflow; - y.overflow = "hidden"; - } - // Simple function for setting a style value z.a = function(){ if ( options.step ) @@ -467,11 +470,13 @@ jQuery.extend({ if ( jQuery.timers.length == 1 ) { var timer = setInterval(function(){ - jQuery.timers = jQuery.grep( jQuery.timers, function(fn){ - return fn(); - }); + var timers = jQuery.timers; + + for ( var i = 0; i < timers.length; i++ ) + if ( !timers[i]() ) + timers.splice(i--, 1); - if ( !jQuery.timers.length ) + if ( !timers.length ) clearInterval( timer ); }, 13); } @@ -489,9 +494,13 @@ jQuery.extend({ // Begin the animation z.custom(0, this.cur()); - // Stupid IE, look what you made me do + // Make sure that we start at a small width/height to avoid any + // flash of content if ( prop != "opacity" ) y[prop] = "1px"; + + // Start by showing the element + jQuery(elem).show(); }; // Simple 'hide' function @@ -506,30 +515,6 @@ jQuery.extend({ // Begin the animation z.custom(this.cur(), 0); }; - - //Simple 'toggle' function - z.toggle = function() { - if ( !elem.orig ) elem.orig = {}; - - // Remember where we started, so that we can go back to it later - elem.orig[prop] = jQuery.attr( elem.style, prop ); - - if(oldDisplay == "none") { - options.show = true; - - // Stupid IE, look what you made me do - if ( prop != "opacity" ) - y[prop] = "1px"; - - // Begin the animation - z.custom(0, this.cur()); - } else { - options.hide = true; - - // Begin the animation - z.custom(this.cur(), 0); - } - }; // Each step of an animation z.step = function(firstNum, lastNum){ @@ -547,18 +532,18 @@ jQuery.extend({ done = false; if ( done ) { - if ( oldDisplay ) { + if ( options.display != null ) { // Reset the overflow - y.overflow = oldOverflow; + y.overflow = options.overflow; // Reset the display - y.display = oldDisplay; - if (jQuery.css(elem, "display") == "none") + y.display = options.display; + if ( jQuery.css(elem, "display") == "none" ) y.display = "block"; } // Hide the element if the "hide" operation was done - if ( options.hide ) + if ( options.hide ) y.display = "none"; // Reset the properties, if the item has been hidden or shown @@ -579,7 +564,7 @@ jQuery.extend({ var p = n / options.duration; // Perform the easing function, defaults to swing - z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration); + z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration); // Perform the next step of the animation z.a();