X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=87d0f4db731345b519ed17b6d5c6c4cdb143d125;hb=9dc6e0c572b9c809a3a4c123071d96d48a01dd1c;hp=9c8abe5709b437b6ac13b7da8db4cf775e3ef91b;hpb=192bab8ed6e8ad2b4c5de0c4660c80b6ecddfd33;p=jquery.git diff --git a/src/effects.js b/src/effects.js index 9c8abe5..87d0f4d 100644 --- a/src/effects.js +++ b/src/effects.js @@ -1,9 +1,8 @@ (function( jQuery ) { var elemdisplay = {}, - rfxtypes = /toggle|show|hide/, + rfxtypes = /^(?:toggle|show|hide)$/, rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/, - rdashAlpha = /-([a-z])/ig, timerId, fxAttrs = [ // height animations @@ -12,11 +11,7 @@ var elemdisplay = {}, [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ], // opacity animations [ "opacity" ] - ], - - fcamelCase = function( all, letter ) { - return letter.toUpperCase(); - }; + ]; jQuery.fn.extend({ show: function( speed, callback ) { @@ -36,7 +31,7 @@ jQuery.fn.extend({ display = elemdisplay[ nodeName ]; } else { - var elem = jQuery("<" + nodeName + " />").appendTo("body"); + var elem = jQuery("<" + nodeName + ">").appendTo("body"); display = elem.css("display"); @@ -125,7 +120,7 @@ jQuery.fn.extend({ self = this; for ( p in prop ) { - var name = p.replace(rdashAlpha, fcamelCase); + var name = jQuery.camelCase( p ); if ( p !== name ) { prop[ name ] = prop[ p ]; @@ -321,7 +316,7 @@ jQuery.fx.prototype = { return this.elem[ this.prop ]; } - var r = parseFloat( jQuery.css( this.elem, this.prop ), 10 ); + var r = parseFloat( jQuery.css( this.elem, this.prop ) ); return r && r > -10000 ? r : 0; },