X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=d76dbdbaeffaa5dbfc4cd84e3da445f68a8641ab;hb=17b1e407d101c5c7f91db633df3a80cd9b4466ae;hp=c45edc1ece3ff5c7df04ac75b795edd7cc16d6e4;hpb=97fe63cb4826cbeb74bc0c3a72648f57ae0f0881;p=jquery.git diff --git a/src/fx.js b/src/fx.js index c45edc1..d76dbdb 100644 --- a/src/fx.js +++ b/src/fx.js @@ -6,9 +6,15 @@ jQuery.fn.extend({ }, speed, callback) : this.filter(":hidden").each(function(){ - this.style.display = this.oldblock ? this.oldblock : ""; - if ( jQuery.css(this,"display") == "none" ) - this.style.display = "block"; + this.style.display = this.oldblock || ""; + if ( jQuery.css(this,"display") == "none" ) { + var elem = jQuery("<" + this.tagName + " />").appendTo("body"); + this.style.display = elem.css("display"); + // handle an edge condition where css is - div { display:none; } or similar + if (this.style.display == "none") + this.style.display = "block"; + elem.remove(); + } }).end(); }, @@ -20,8 +26,6 @@ jQuery.fn.extend({ this.filter(":visible").each(function(){ this.oldblock = this.oldblock || jQuery.css(this,"display"); - if ( this.oldblock == "none" ) - this.oldblock = "block"; this.style.display = "none"; }).end(); }, @@ -31,7 +35,7 @@ jQuery.fn.extend({ toggle: function( fn, fn2 ){ return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? - this._toggle( fn, fn2 ) : + this._toggle.apply( this, arguments ) : fn ? this.animate({ height: "toggle", width: "toggle", opacity: "toggle" @@ -66,13 +70,16 @@ jQuery.fn.extend({ }, animate: function( prop, speed, easing, callback ) { - var opt = jQuery.speed(speed, easing, callback); + var optall = jQuery.speed(speed, easing, callback); + + return this[ optall.queue === false ? "each" : "queue" ](function(){ + if ( this.nodeType != 1) + return false; - return this[ opt.queue === false ? "each" : "queue" ](function(){ - opt = jQuery.extend({}, opt); - var hidden = jQuery(this).is(":hidden"), self = this; + var opt = jQuery.extend({}, optall), p, + hidden = jQuery(this).is(":hidden"), self = this; - for ( var p in prop ) { + for ( p in prop ) { if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) return jQuery.isFunction(opt.complete) && opt.complete.apply(this); @@ -96,23 +103,23 @@ jQuery.fn.extend({ if ( /toggle|show|hide/.test(val) ) e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); else { - var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/), + var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), start = e.cur(true) || 0; if ( parts ) { - end = parseFloat(parts[2]), - unit = parts[3] || "px"; + var end = parseFloat(parts[2]), + unit = parts[3] || "px"; // We need to compute starting value if ( unit != "px" ) { - self.style[ name ] = end + unit; - start = (end / e.cur(true)) * start; + self.style[ name ] = (end || 1) + unit; + start = ((end || 1) / e.cur(true)) * start; self.style[ name ] = start + unit; } - // If a +/- token was provided, we're doing a relative animation + // If a +=/-= token was provided, we're doing a relative animation if ( parts[1] ) - end = ((parts[1] == "-" ? -1 : 1) * end) + start; + end = ((parts[1] == "-=" ? -1 : 1) * end) + start; e.custom( start, end, unit ); } else @@ -126,12 +133,12 @@ jQuery.fn.extend({ }, queue: function(type, fn){ - if ( !fn ) { + if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) { fn = type; type = "fx"; } - if ( !arguments.length ) + if ( !type || (typeof type == "string" && !fn) ) return queue( this[0], type ); return this.each(function(){ @@ -146,43 +153,58 @@ jQuery.fn.extend({ }); }, - dequeue: function(type){ - type = type || "fx"; - - return this.each(function(){ - var q = queue(this, type); - - q.shift(); + stop: function(clearQueue, gotoEnd){ + var timers = jQuery.timers; - if ( q.length ) - q[0].apply( this ); + 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-- ) + if ( timers[i].elem == this ) { + if (gotoEnd) + // force the next step to be the last + timers[i](true); + timers.splice(i, 1); + } }); - }, - stop: function(){ - var timers = jQuery.timers; + // start the next in the queue if the last step wasn't forced + if (!gotoEnd) + this.dequeue(); - return this.each(function(){ - for ( var i = 0; i < timers.length; i++ ) - if ( timers[i].elem == this ) - timers.splice(i--, 1); - }).dequeue(); + return this; } }); -function queue( elem, type, array ) { - if ( !elem ) - return; +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) ); + + } + return q; +}; - var queue = jQuery.data( elem, type + "queue" ); +jQuery.fn.dequeue = function(type){ + type = type || "fx"; - if ( !queue || array ) - queue = jQuery.data( elem, type + "queue", - array ? jQuery.makeArray(array) : [] ); + return this.each(function(){ + var q = queue(this, type); - return queue; -} + q.shift(); + + if ( q.length ) + q[0].apply( this ); + }); +}; jQuery.extend({ @@ -196,12 +218,13 @@ jQuery.extend({ opt.duration = (opt.duration && opt.duration.constructor == Number ? opt.duration : - { slow: 600, fast: 200 }[opt.duration]) || 400; + jQuery.fx.speeds[opt.duration]) || 400; // Queueing opt.old = opt.complete; opt.complete = function(){ - jQuery(this).dequeue(); + if ( opt.queue !== false ) + jQuery(this).dequeue(); if ( jQuery.isFunction( opt.old ) ) opt.old.apply( this ); }; @@ -219,6 +242,7 @@ jQuery.extend({ }, timers: [], + timerId: null, fx: function( elem, options, prop ){ this.options = options; @@ -250,13 +274,13 @@ jQuery.fx.prototype = { if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null ) return this.elem[ this.prop ]; - var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force)); - return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0; + var r = parseFloat(jQuery.css(this.elem, this.prop, force)); + return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; }, // Start an animation from one number to another custom: function(from, to, unit){ - this.startTime = (new Date()).getTime(); + this.startTime = now(); this.start = from; this.end = to; this.unit = unit || this.unit || "px"; @@ -265,24 +289,26 @@ jQuery.fx.prototype = { this.update(); var self = this; - function t(){ - return self.step(); + function t(gotoEnd){ + return self.step(gotoEnd); } t.elem = this.elem; jQuery.timers.push(t); - if ( jQuery.timers.length == 1 ) { - var timer = setInterval(function(){ + 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); - if ( !timers.length ) - clearInterval( timer ); + if ( !timers.length ) { + clearInterval( jQuery.timerId ); + jQuery.timerId = null; + } }, 13); } }, @@ -316,10 +342,10 @@ jQuery.fx.prototype = { }, // Each step of an animation - step: function(){ - var t = (new Date()).getTime(); + step: function(gotoEnd){ + var t = now(); - if ( 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(); @@ -375,20 +401,26 @@ jQuery.fx.prototype = { }; -jQuery.fx.step = { - scrollLeft: function(fx){ - fx.elem.scrollLeft = fx.now; - }, - - scrollTop: function(fx){ - fx.elem.scrollTop = fx.now; +jQuery.extend( jQuery.fx, { + speeds:{ + slow: 600, + fast: 200 }, - - opacity: function(fx){ - jQuery.attr(fx.elem.style, "opacity", fx.now); - }, - - _default: function(fx){ - fx.elem.style[ fx.prop ] = fx.now + fx.unit; + 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; + } } -}; +});