X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Feffects.js;h=97456ccc4b4cab163ac00faecef36b43df9f5f85;hb=04e31ff058548fbdbdf77c61d4edc3a974b080f4;hp=7fa7342088e137abf1da1ac7531fb677f7ad2edc;hpb=21441b1cbc7a205e621b8c94a21eff102380ca03;p=jquery.git diff --git a/src/effects.js b/src/effects.js index 7fa7342..97456cc 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 @@ -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), @@ -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; -}