X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=8025de4d218f96c2e457f306d33728fc9c945b2e;hb=fe80b5af45049d1c8d10682eb1075f838d52a045;hp=220b88a759499110140b81212277c8ec41f808a4;hpb=f8ef75eb9124ce924be5fb521c783efd5c996e33;p=jquery.git diff --git a/src/fx.js b/src/fx.js index 220b88a..8025de4 100644 --- a/src/fx.js +++ b/src/fx.js @@ -28,12 +28,12 @@ jQuery.fn.extend({ this[i].style.display = old || ""; if ( jQuery.css(this[i], "display") === "none" ) { - var tagName = this[i].tagName, display; + var nodeName = this[i].nodeName, display; - if ( elemdisplay[ tagName ] ) { - display = elemdisplay[ tagName ]; + 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" ) @@ -41,7 +41,7 @@ jQuery.fn.extend({ elem.remove(); - elemdisplay[ tagName ] = display; + elemdisplay[ nodeName ] = display; } jQuery.data(this[i], "olddisplay", display); @@ -132,7 +132,7 @@ 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 = /^([+-]=)?([\d+-.]+)(.*)$/.exec(val), start = e.cur(true) || 0; if ( parts ) { @@ -286,20 +286,8 @@ jQuery.fx.prototype = { t.elem = this.elem; - if ( t() && jQuery.timers.push(t) && !timerId ) { - 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( timerId ); - timerId = undefined; - } - }, 13); - } + if ( t() && jQuery.timers.push(t) && !timerId ) + timerId = setInterval(jQuery.fx.tick, 13); }, // Simple 'show' function @@ -386,12 +374,30 @@ 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){