X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=46000a58b8b7521c52a11ac876702717efee5a2f;hb=ddb86f8d5bd1bd21b2beeeea55baf505b47dfed5;hp=40bbc61edace1fb541bff244c9b8f0af19c8c200;hpb=e216243a03d13d659f9811ef20ede3b213fd33f1;p=jquery.git diff --git a/src/fx.js b/src/fx.js index 40bbc61..46000a5 100644 --- a/src/fx.js +++ b/src/fx.js @@ -1,4 +1,5 @@ var elemdisplay = {}, + timerId, fxAttrs = [ // height animations [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ], @@ -23,30 +24,36 @@ jQuery.fn.extend({ } 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 ]; + var nodeName = this[i].nodeName, display; + + if ( elemdisplay[ nodeName ] ) { + display = elemdisplay[ nodeName ]; } else { - var elem = jQuery("<" + tagName + " />").appendTo("body"); - + var elem = jQuery("<" + nodeName + " />").appendTo("body"); + display = elem.css("display"); - if ( display === "none" ) + if ( display === "none" ) { display = "block"; - + } elem.remove(); - - elemdisplay[ tagName ] = display; + + elemdisplay[ nodeName ] = 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; } }, @@ -57,10 +64,17 @@ jQuery.fn.extend({ } else { for ( var i = 0, l = this.length; i < l; i++ ){ var old = jQuery.data(this[i], "olddisplay"); - if ( !old && old !== "none" ) + 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; } }, @@ -82,22 +96,31 @@ jQuery.fn.extend({ }, 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); + var name = p.replace(rdashAlpha, fcamelCase); + + if ( p !== name ) { + prop[ name ] = prop[ p ]; + delete prop[ p ]; + p = name; + } + if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) { + return opt.complete.call(this); + } if ( ( p == "height" || p == "width" ) && this.style ) { // Store display property opt.display = jQuery.css(this, "display"); @@ -107,18 +130,18 @@ jQuery.fn.extend({ } } - if ( opt.overflow != null ) + if ( opt.overflow != null ) { this.style.overflow = "hidden"; - + } opt.curAnim = jQuery.extend({}, prop); jQuery.each( prop, function(name, val){ var e = new jQuery.fx( self, opt, name ); - if ( /toggle|show|hide/.test(val) ) + if ( /toggle|show|hide/.test(val) ) { e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); - else { - var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), + } else { + var parts = /^([+-]=)?([\d+-.]+)(.*)$/.exec(val), start = e.cur(true) || 0; if ( parts ) { @@ -133,15 +156,20 @@ jQuery.fn.extend({ } // If a +=/-= token was provided, we're doing a relative animation - if ( parts[1] ) + if ( parts[1] ) { end = ((parts[1] == "-=" ? -1 : 1) * end) + start; - + } e.custom( start, end, unit ); - } else + } else { e.custom( start, val, "" ); + } } }); + if ( jQuery.isEmptyObject( prop ) ) { + return optall.complete.call(this); + } + // For JS strict compliance return true; }); @@ -150,24 +178,26 @@ jQuery.fn.extend({ stop: function(clearQueue, gotoEnd){ var timers = jQuery.timers; - if (clearQueue) + if (clearQueue) { this.queue([]); - + } this.each(function(){ // go in reverse order so anything added to the queue during the loop is ignored - for ( var i = timers.length - 1; i >= 0; i-- ) + for ( var i = timers.length - 1; i >= 0; i-- ) { if ( timers[i].elem == this ) { - if (gotoEnd) + if (gotoEnd) { // force the next step to be the last timers[i](true); + } timers.splice(i, 1); } + } }); // start the next in the queue if the last step wasn't forced - if (!gotoEnd) + if (!gotoEnd) { this.dequeue(); - + } return this; } @@ -202,10 +232,12 @@ jQuery.extend({ // Queueing opt.old = opt.complete; opt.complete = function(){ - if ( opt.queue !== false ) + if ( opt.queue !== false ) { jQuery(this).dequeue(); - if ( jQuery.isFunction( opt.old ) ) + } + if ( jQuery.isFunction( opt.old ) ) { opt.old.call( this ); + } }; return opt; @@ -221,15 +253,15 @@ jQuery.extend({ }, timers: [], - timerId: null, fx: function( elem, options, prop ){ this.options = options; this.elem = elem; this.prop = prop; - if ( !options.orig ) + if ( !options.orig ) { options.orig = {}; + } } }); @@ -238,21 +270,22 @@ jQuery.fx.prototype = { // Simple function for setting a style value update: function(){ - if ( this.options.step ) + if ( this.options.step ) { 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" ) && this.elem.style ) + 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.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)); return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; }, @@ -273,28 +306,15 @@ jQuery.fx.prototype = { t.elem = this.elem; - jQuery.timers.push(t); - - 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); - - if ( !timers.length ) { - clearInterval( jQuery.timerId ); - jQuery.timerId = null; - } - }, 13); + if ( t() && jQuery.timers.push(t) && !timerId ) { + timerId = setInterval(jQuery.fx.tick, 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 @@ -309,7 +329,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 @@ -328,10 +348,11 @@ jQuery.fx.prototype = { this.options.curAnim[ this.prop ] = true; var done = true; - for ( var i in this.options.curAnim ) - if ( this.options.curAnim[i] !== true ) + for ( var i in this.options.curAnim ) { + if ( this.options.curAnim[i] !== true ) { done = false; - + } + } if ( done ) { if ( this.options.display != null ) { // Reset the overflow @@ -339,23 +360,24 @@ jQuery.fx.prototype = { // Reset the display this.elem.style.display = this.options.display; - if ( jQuery.css(this.elem, "display") == "none" ) + if ( jQuery.css(this.elem, "display") == "none" ) { this.elem.style.display = "block"; + } } // Hide the element if the "hide" operation was done - if ( this.options.hide ) + if ( this.options.hide ) { jQuery(this.elem).hide(); - + } // 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 ) + if ( this.options.hide || this.options.show ){ + for ( var p in this.options.curAnim ) { + jQuery.style(this.elem, p, this.options.orig[p]); + } + } // Execute the complete function this.options.complete.call( this.elem ); + } return false; } else { @@ -376,23 +398,52 @@ jQuery.fx.prototype = { }; jQuery.extend( jQuery.fx, { + + tick:function(){ + var timers = jQuery.timers; + + for ( var i = 0; i < timers.length; i++ ) { + if ( !timers[i]() ) { + timers.splice(i--, 1); + } + } + if ( !timers.length ) { + jQuery.fx.stop(); + } + }, + + stop:function(){ + clearInterval( timerId ); + timerId = null; + }, + speeds:{ slow: 600, fast: 200, // Default speed _default: 400 }, + step: { opacity: function(fx){ - jQuery.attr(fx.elem.style, "opacity", fx.now); + jQuery.style(fx.elem, "opacity", fx.now); }, _default: function(fx){ - if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) + if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) { fx.elem.style[ fx.prop ] = fx.now + fx.unit; - else + } else { fx.elem[ fx.prop ] = fx.now; + } } } }); + +if ( jQuery.expr && jQuery.expr.filters ) { + jQuery.expr.filters.animated = function(elem){ + return jQuery.grep(jQuery.timers, function(fn){ + return elem === fn.elem; + }).length; + }; +}