Make sure that data properties with hyphens are always accessed/set using camelCase. Fixes #9124.

This commit is contained in:
John Resig 2011-05-10 11:56:42 -04:00
parent 419b5e5e2a
commit a5e407cafb
2 changed files with 9 additions and 4 deletions

View file

@ -98,7 +98,7 @@ jQuery.extend({
} }
if ( data !== undefined ) { if ( data !== undefined ) {
thisCache[ name ] = data; thisCache[ jQuery.camelCase( name ) ] = data;
} }
// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should // TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
@ -108,7 +108,7 @@ jQuery.extend({
return thisCache[ internalKey ] && thisCache[ internalKey ].events; return thisCache[ internalKey ] && thisCache[ internalKey ].events;
} }
return getByName ? thisCache[ name ] : thisCache; return getByName ? thisCache[ jQuery.camelCase( name ) ] : thisCache;
}, },
removeData: function( elem, name, pvt /* Internal Use Only */ ) { removeData: function( elem, name, pvt /* Internal Use Only */ ) {

View file

@ -488,7 +488,7 @@ if (window.JSON && window.JSON.stringify) {
} }
test("jQuery.data should follow html5 specification regarding camel casing", function() { test("jQuery.data should follow html5 specification regarding camel casing", function() {
expect(6); expect(8);
var div = jQuery("<div id='myObject' data-foo='a' data-foo-bar='b' data-foo-bar-baz='c'></div>") var div = jQuery("<div id='myObject' data-foo='a' data-foo-bar='b' data-foo-bar-baz='c'></div>")
.prependTo("body"); .prependTo("body");
@ -501,5 +501,10 @@ test("jQuery.data should follow html5 specification regarding camel casing", fun
equals(div.data("fooBar"), "b", "Verify multiple word data-* key"); equals(div.data("fooBar"), "b", "Verify multiple word data-* key");
equals(div.data("fooBarBaz"), "c", "Verify multiple word data-* key"); equals(div.data("fooBarBaz"), "c", "Verify multiple word data-* key");
div.data("foo-bar", "d");
equals(div.data("fooBar"), "d", "Verify updated data-* key");
equals(div.data("foo-bar"), "d", "Verify updated data-* key");
div.remove(); div.remove();
}); });