Permalink
Browse files

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

…#9368.

More Details:
 - #383
 - http://bugs.jquery.com/ticket/9368
  • Loading branch information...
rwaldron authored and timmywil committed May 25, 2011
1 parent b8fc9d1 commit 408c98fb4b8c1b6957cfe620711f9ea7645293ba
Showing with 29 additions and 10 deletions.
  1. +14 −0 src/core.js
  2. +1 −10 src/css.js
  3. +14 −0 test/unit/core.js
View
@@ -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();
},
View
@@ -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 );
}
});
View
@@ -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 );
+ });
+});

0 comments on commit 408c98f

Please sign in to comment.