X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=9dcedbfdf620bd98a8bccba4b4c93a5099ae0ae9;hb=69212c501f8875b4650847053cc41eaa470e5848;hp=1a4e8c94695eff6ca33dcbb77229aab29b38d356;hpb=99101e02f957087410cc0b5837ef09e3dfa12466;p=jquery.git diff --git a/src/fx.js b/src/fx.js index 1a4e8c9..9dcedbf 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.call(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,7 +125,7 @@ jQuery.fn.extend({ queue(this, type, fn); else { queue(this, type).push( fn ); - + if ( queue(this, type).length == 1 ) 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) ); @@ -207,19 +199,19 @@ jQuery.fn.dequeue = function(type){ }; 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]) || jQuery.fx.speeds.def; - + opt.duration = (opt.duration && opt.duration.constructor == Number ? + opt.duration : + jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds._default; + // Queueing opt.old = opt.complete; opt.complete = function(){ @@ -228,10 +220,10 @@ jQuery.extend({ if ( jQuery.isFunction( opt.old ) ) opt.old.call( this ); }; - + return opt; }, - + easing: { linear: function( p, n, firstNum, diff ) { return firstNum + diff * p; @@ -240,7 +232,7 @@ jQuery.extend({ return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; } }, - + timers: [], timerId: null, @@ -265,13 +257,13 @@ jQuery.fx.prototype = { (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)); @@ -300,7 +292,7 @@ jQuery.fx.prototype = { if ( 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 +318,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(); }, @@ -361,7 +353,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,8 +370,7 @@ 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.call( this.elem ); @@ -403,25 +394,22 @@ jQuery.fx.prototype = { jQuery.extend( jQuery.fx, { speeds:{ - slow: 600, + slow: 600, fast: 200, - def: 400 //default speed + // 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; } } });