From 77e310b906112c9e20dfbf0e91249a0b81cf6107 Mon Sep 17 00:00:00 2001 From: John Resig Date: Fri, 17 Sep 2010 14:53:10 -0400 Subject: [PATCH] Simplifying the camelCase logic used in the CSS and Effects modules. --- src/css.js | 8 ++++++-- src/effects.js | 9 ++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/css.js b/src/css.js index 8ea815c8e..84b6e6023 100644 --- a/src/css.js +++ b/src/css.js @@ -64,7 +64,7 @@ jQuery.extend({ } // Make sure that we're working with the right name - var ret, origName = name.replace( rdashAlpha, fcamelCase ), + var ret, origName = jQuery.camelCase( name ), style = elem.style, hooks = jQuery.cssHooks[ origName ]; name = jQuery.cssProps[ origName ] || origName; @@ -94,7 +94,7 @@ jQuery.extend({ css: function( elem, name, extra ) { // Make sure that we're working with the right name - var ret, origName = name.replace( rdashAlpha, fcamelCase ), + var ret, origName = jQuery.camelCase( name ), hooks = jQuery.cssHooks[ origName ]; name = jQuery.cssProps[ origName ] || origName; @@ -125,6 +125,10 @@ jQuery.extend({ for ( name in options ) { elem.style[ name ] = old[ name ]; } + }, + + camelCase: function( string ) { + return string.replace( rdashAlpha, fcamelCase ); } }); diff --git a/src/effects.js b/src/effects.js index 9c8abe570..9db341a3b 100644 --- a/src/effects.js +++ b/src/effects.js @@ -3,7 +3,6 @@ var elemdisplay = {}, 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 ) { @@ -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 ]; -- 2.39.5