X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=3fe936909971d8676dc80e2090239f5df75e5e9f;hb=61784e15816a35086388ebd5b98b56dea3535052;hp=d76dbdbaeffaa5dbfc4cd84e3da445f68a8641ab;hpb=17b1e407d101c5c7f91db633df3a80cd9b4466ae;p=jquery.git diff --git a/src/fx.js b/src/fx.js index d76dbdb..3fe9369 100644 --- a/src/fx.js +++ b/src/fx.js @@ -4,7 +4,7 @@ jQuery.fn.extend({ this.animate({ height: "show", width: "show", opacity: "show" }, speed, callback) : - + this.filter(":hidden").each(function(){ this.style.display = this.oldblock || ""; if ( jQuery.css(this,"display") == "none" ) { @@ -17,13 +17,13 @@ jQuery.fn.extend({ } }).end(); }, - + hide: function(speed,callback){ return speed ? this.animate({ height: "hide", width: "hide", opacity: "hide" }, speed, callback) : - + this.filter(":visible").each(function(){ this.oldblock = this.oldblock || jQuery.css(this,"display"); this.style.display = "none"; @@ -32,7 +32,7 @@ jQuery.fn.extend({ // Save the old toggle function _toggle: jQuery.fn.toggle, - + toggle: function( fn, fn2 ){ return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? this._toggle.apply( this, arguments ) : @@ -44,46 +44,25 @@ jQuery.fn.extend({ jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); }); }, - - slideDown: function(speed,callback){ - return this.animate({height: "show"}, speed, callback); - }, - - slideUp: function(speed,callback){ - return this.animate({height: "hide"}, speed, callback); - }, - slideToggle: function(speed, callback){ - return this.animate({height: "toggle"}, speed, callback); - }, - - fadeIn: function(speed, callback){ - return this.animate({opacity: "show"}, speed, callback); - }, - - fadeOut: function(speed, callback){ - return this.animate({opacity: "hide"}, speed, callback); - }, - fadeTo: function(speed,to,callback){ return this.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(){ - if ( this.nodeType != 1) - return false; - + var opt = jQuery.extend({}, optall), p, - hidden = jQuery(this).is(":hidden"), self = this; - + hidden = this.nodeType == 1 && jQuery(this).is(":hidden"), + self = this; + for ( p in prop ) { if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) - return jQuery.isFunction(opt.complete) && opt.complete.apply(this); + return opt.complete.call(this); - if ( p == "height" || p == "width" ) { + if ( ( p == "height" || p == "width" ) && this.style ) { // Store display property opt.display = jQuery.css(this, "display"); @@ -96,7 +75,7 @@ jQuery.fn.extend({ this.style.overflow = "hidden"; opt.curAnim = jQuery.extend({}, prop); - + jQuery.each( prop, function(name, val){ var e = new jQuery.fx( self, opt, name ); @@ -131,7 +110,7 @@ jQuery.fn.extend({ return true; }); }, - + queue: function(type, fn){ if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) { fn = type; @@ -146,9 +125,9 @@ jQuery.fn.extend({ queue(this, type, fn); else { queue(this, type).push( fn ); - + if ( queue(this, type).length == 1 ) - fn.apply(this); + fn.call(this); } }); }, @@ -179,13 +158,26 @@ jQuery.fn.extend({ }); +// Generate shortcuts for custom animations +jQuery.each({ + slideDown: { height:"show" }, + slideUp: { height: "hide" }, + slideToggle: { height: "toggle" }, + fadeIn: { opacity: "show" }, + fadeOut: { opacity: "hide" } +}, function( name, props ){ + jQuery.fn[ name ] = function( speed, callback ){ + return this.animate( props, speed, callback ); + }; +}); + var queue = function( elem, type, array ) { if ( elem ){ - + type = type || "fx"; - + var q = jQuery.data( elem, type + "queue" ); - + if ( !q || array ) q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) ); @@ -202,36 +194,35 @@ jQuery.fn.dequeue = function(type){ q.shift(); if ( q.length ) - q[0].apply( this ); + q[0].call( this ); }); }; jQuery.extend({ - + speed: function(speed, easing, fn) { var opt = speed && speed.constructor == Object ? speed : { - complete: fn || !fn && easing || + complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, easing: fn && easing || easing && easing.constructor != Function && easing }; - opt.duration = (opt.duration && opt.duration.constructor == Number ? - opt.duration : - jQuery.fx.speeds[opt.duration]) || 400; - + opt.duration = jQuery.fx.off ? 0 : typeof opt.duration == 'number' ? opt.duration : + jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default; + // Queueing opt.old = opt.complete; opt.complete = function(){ if ( opt.queue !== false ) jQuery(this).dequeue(); if ( jQuery.isFunction( opt.old ) ) - opt.old.apply( this ); + opt.old.call( this ); }; - + return opt; }, - + easing: { linear: function( p, n, firstNum, diff ) { return firstNum + diff * p; @@ -240,7 +231,7 @@ jQuery.extend({ return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; } }, - + timers: [], timerId: null, @@ -260,18 +251,18 @@ jQuery.fx.prototype = { // Simple function for setting a style value update: function(){ if ( this.options.step ) - this.options.step.apply( this.elem, [ this.now, this ] ); + this.options.step.call( this.elem, this.now, this ); (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); // Set display property to block for height/width animations - if ( this.prop == "height" || this.prop == "width" ) + if ( ( this.prop == "height" || this.prop == "width" ) && this.elem.style ) this.elem.style.display = "block"; }, // Get the current size cur: function(force){ - if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null ) + if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) return this.elem[ this.prop ]; var r = parseFloat(jQuery.css(this.elem, this.prop, force)); @@ -286,7 +277,6 @@ jQuery.fx.prototype = { this.unit = unit || this.unit || "px"; this.now = this.start; this.pos = this.state = 0; - this.update(); var self = this; function t(gotoEnd){ @@ -297,10 +287,10 @@ jQuery.fx.prototype = { jQuery.timers.push(t); - if ( jQuery.timerId == null ) { + if ( t() && jQuery.timerId == null ) { jQuery.timerId = setInterval(function(){ var timers = jQuery.timers; - + for ( var i = 0; i < timers.length; i++ ) if ( !timers[i]() ) timers.splice(i--, 1); @@ -326,7 +316,7 @@ jQuery.fx.prototype = { // flash of content if ( this.prop == "width" || this.prop == "height" ) this.elem.style[this.prop] = "1px"; - + // Start by showing the element jQuery(this.elem).show(); }, @@ -345,7 +335,7 @@ jQuery.fx.prototype = { step: function(gotoEnd){ var t = now(); - if ( gotoEnd || t > this.options.duration + this.startTime ) { + if ( gotoEnd || t >= this.options.duration + this.startTime ) { this.now = this.end; this.pos = this.state = 1; this.update(); @@ -361,7 +351,7 @@ jQuery.fx.prototype = { if ( this.options.display != null ) { // Reset the overflow this.elem.style.overflow = this.options.overflow; - + // Reset the display this.elem.style.display = this.options.display; if ( jQuery.css(this.elem, "display") == "none" ) @@ -378,10 +368,9 @@ jQuery.fx.prototype = { jQuery.attr(this.elem.style, p, this.options.orig[p]); } - // If a callback was provided, execute it - if ( done && jQuery.isFunction( this.options.complete ) ) + if ( done ) // Execute the complete function - this.options.complete.apply( this.elem ); + this.options.complete.call( this.elem ); return false; } else { @@ -403,24 +392,22 @@ jQuery.fx.prototype = { jQuery.extend( jQuery.fx, { speeds:{ - slow: 600, - fast: 200 + slow: 600, + fast: 200, + // Default speed + _default: 400 }, step: { - scrollLeft: function(fx){ - fx.elem.scrollLeft = fx.now; - }, - - scrollTop: function(fx){ - fx.elem.scrollTop = fx.now; - }, - + opacity: function(fx){ jQuery.attr(fx.elem.style, "opacity", fx.now); }, - + _default: function(fx){ - fx.elem.style[ fx.prop ] = fx.now + fx.unit; + if( fx.prop in fx.elem ) + fx.elem[ fx.prop ] = fx.now; + else if( fx.elem.style ) + fx.elem.style[ fx.prop ] = fx.now + fx.unit; } } });