Commit 1a738cb7 authored by dmethvin's avatar dmethvin Committed by timmywil

Landing pull request 463. Fixes #9572. Don't camelize the `-ms-` prefix...

Landing pull request 463. Fixes #9572. Don't camelize the `-ms-` prefix because Microsoft didn't. A Fixes #9572.

More Details:
 - https://github.com/jquery/jquery/pull/463
 - http://bugs.jquery.com/ticket/9572
parent 130a29e7
...@@ -47,6 +47,7 @@ var jQuery = function( selector, context ) { ...@@ -47,6 +47,7 @@ var jQuery = function( selector, context ) {
// Matches dashed string for camelizing // Matches dashed string for camelizing
rdashAlpha = /-([a-z]|[0-9])/ig, rdashAlpha = /-([a-z]|[0-9])/ig,
rmsPrefix = /^-ms-/,
// Used by jQuery.camelCase as callback to replace() // Used by jQuery.camelCase as callback to replace()
fcamelCase = function( all, letter ) { fcamelCase = function( all, letter ) {
...@@ -590,10 +591,10 @@ jQuery.extend({ ...@@ -590,10 +591,10 @@ jQuery.extend({
} }
}, },
// Converts a dashed string to camelCased string; // Convert dashed to camelCase; used by the css and data modules
// Used by both the css and data modules // Microsoft forgot to hump their vendor prefix (#9572)
camelCase: function( string ) { camelCase: function( string ) {
return string.replace( rdashAlpha, fcamelCase ); return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
}, },
nodeName: function( elem, name ) { nodeName: function( elem, name ) {
......
...@@ -1129,10 +1129,15 @@ test("jQuery.camelCase()", function() { ...@@ -1129,10 +1129,15 @@ test("jQuery.camelCase()", function() {
var tests = { var tests = {
"foo-bar": "fooBar", "foo-bar": "fooBar",
"foo-bar-baz": "fooBarBaz" "foo-bar-baz": "fooBarBaz",
"girl-u-want": "girlUWant",
"the-4th-dimension": "the4thDimension",
"-o-tannenbaum": "OTannenbaum",
"-moz-illa": "MozIlla",
"-ms-take": "msTake"
}; };
expect(2); expect(7);
jQuery.each( tests, function( key, val ) { jQuery.each( tests, function( key, val ) {
equal( jQuery.camelCase( key ), val, "Converts: " + key + " => " + val ); equal( jQuery.camelCase( key ), val, "Converts: " + key + " => " + val );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment