Skip to content
Permalink
Browse files

Simplifying the camelCase logic used in the CSS and Effects modules.

  • Loading branch information...
jeresig committed Sep 17, 2010
1 parent 6541eb9 commit 77e310b906112c9e20dfbf0e91249a0b81cf6107
Showing with 8 additions and 9 deletions.
  1. +6 −2 src/css.js
  2. +2 −7 src/effects.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 );
}
});

@@ -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 ];

0 comments on commit 77e310b

Please sign in to comment.
You can’t perform that action at this time.