X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=40326e23da1b9a2a5f30b0bae31490bb82b2bfee;hb=8effe3a7dee91c833cc1774646da9d743600c64c;hp=ff2f145b89ebcf6f4cab8ef72f0aca8baa891c57;hpb=61e37d41490aed319a176c6ca7feb95e5505059c;p=jquery.git diff --git a/src/effects.js b/src/effects.js index ff2f145..40326e2 100644 --- a/src/effects.js +++ b/src/effects.js @@ -1,6 +1,6 @@ var elemdisplay = {}, rfxtypes = /toggle|show|hide/, - rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/, + rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/, timerId, fxAttrs = [ // height animations @@ -13,7 +13,7 @@ var elemdisplay = {}, jQuery.fn.extend({ show: function( speed, callback ) { - if ( speed != null ) { + if ( speed || speed === 0) { return this.animate( genFx("show", 3), speed, callback); } else { @@ -57,7 +57,7 @@ jQuery.fn.extend({ }, hide: function( speed, callback ) { - if ( speed != null ) { + if ( speed || speed === 0 ) { return this.animate( genFx("hide", 3), speed, callback); } else { @@ -221,6 +221,16 @@ jQuery.fn.extend({ }); +function genFx( type, num ) { + var obj = {}; + + jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() { + obj[ this ] = type; + }); + + return obj; +} + // Generate shortcuts for custom animations jQuery.each({ slideDown: genFx("show", 1), @@ -310,7 +320,7 @@ jQuery.fx.prototype = { // Start an animation from one number to another custom: function( from, to, unit ) { - this.startTime = now(); + this.startTime = jQuery.now(); this.start = from; this.end = to; this.unit = unit || this.unit || "px"; @@ -356,7 +366,7 @@ jQuery.fx.prototype = { // Each step of an animation step: function( gotoEnd ) { - var t = now(), done = true; + var t = jQuery.now(), done = true; if ( gotoEnd || t >= this.options.duration + this.startTime ) { this.now = this.end; @@ -443,9 +453,9 @@ jQuery.extend( jQuery.fx, { speeds: { slow: 600, - fast: 200, - // Default speed - _default: 400 + fast: 200, + // Default speed + _default: 400 }, step: { @@ -470,13 +480,3 @@ if ( jQuery.expr && jQuery.expr.filters ) { }).length; }; } - -function genFx( type, num ) { - var obj = {}; - - jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() { - obj[ this ] = type; - }); - - return obj; -}