From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 25 May 2011 19:10:49 +0000 (-0400)
Subject: Landing pull request 383. Relocating jQuery.camelCase to core; Fixes #9368.
X-Git-Tag: 1.6.2rc1~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=408c98fb4b8c1b6957cfe620711f9ea7645293ba;p=jquery.git

Landing pull request 383. Relocating jQuery.camelCase to core; Fixes #9368.

More Details:
 - https://github.com/jquery/jquery/pull/383
 - http://bugs.jquery.com/ticket/9368
---

diff --git a/src/core.js b/src/core.js
index 056fb88fb..3a32d6f0c 100644
--- a/src/core.js
+++ b/src/core.js
@@ -44,6 +44,14 @@ var jQuery = function( selector, context ) {
 	rmsie = /(msie) ([\w.]+)/,
 	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
 
+	// Matches dashed string for camelizing
+	rdashAlpha = /-([a-z])/ig,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	},
+
 	// Keep a UserAgent string for use with jQuery.browser
 	userAgent = navigator.userAgent,
 
@@ -582,6 +590,12 @@ jQuery.extend({
 		}
 	},
 
+	// Converts a dashed string to camelCased string;
+	// Used by both the css and data modules
+	camelCase: function( string ) {
+		return string.replace( rdashAlpha, fcamelCase );
+	},
+
 	nodeName: function( elem, name ) {
 		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
 	},
diff --git a/src/css.js b/src/css.js
index 661d800d7..46f6bf31f 100644
--- a/src/css.js
+++ b/src/css.js
@@ -2,7 +2,6 @@
 
 var ralpha = /alpha\([^)]*\)/i,
 	ropacity = /opacity=([^)]*)/,
-	rdashAlpha = /-([a-z])/ig,
 	// fixed for IE9, see #8346
 	rupper = /([A-Z]|^ms)/g,
 	rnumpx = /^-?\d+(?:px)?$/i,
@@ -16,11 +15,7 @@ var ralpha = /alpha\([^)]*\)/i,
 	curCSS,
 
 	getComputedStyle,
-	currentStyle,
-
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
+	currentStyle;
 
 jQuery.fn.css = function( name, value ) {
 	// Setting 'undefined' is a no-op
@@ -164,10 +159,6 @@ jQuery.extend({
 		for ( name in options ) {
 			elem.style[ name ] = old[ name ];
 		}
-	},
-
-	camelCase: function( string ) {
-		return string.replace( rdashAlpha, fcamelCase );
 	}
 });
 
diff --git a/test/unit/core.js b/test/unit/core.js
index 75d3e0e2c..3a1553526 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1104,3 +1104,17 @@ test("jQuery.sub() - .fn Methods", function(){
 	});
 
 });
+
+test("jQuery.camelCase()", function() {
+
+	var tests = {
+		"foo-bar": "fooBar", 
+		"foo-bar-baz": "fooBarBaz"
+	};
+
+	expect(2);
+
+	jQuery.each( tests, function( key, val ) {
+		equal( jQuery.camelCase( key ), val, "Converts: " + key + " => " + val );
+	});
+});