Skip to content
Browse files

Bug in rmultidash. Fixes #10194

  • Loading branch information...
1 parent 4bc691a commit 8e8fa6dc1ad514b0fa20e41faddcb85693d0408a @rwaldron rwaldron committed with dmethvin
Showing with 16 additions and 12 deletions.
  1. +3 −2 src/data.js
  2. +13 −10 test/unit/data.js
View
5 src/data.js
@@ -1,7 +1,7 @@
(function( jQuery ) {
var rbrace = /^(?:\{.*\}|\[.*\])$/,
- rmultiDash = /([a-z])([A-Z])/g;
+ rmultiDash = /([A-Z])/g;
jQuery.extend({
cache: {},
@@ -316,7 +316,8 @@ function dataAttr( elem, key, data ) {
// If nothing was found internally, try to fetch any
// data from the HTML5 data-* attribute
if ( data === undefined && elem.nodeType === 1 ) {
- var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase();
+
+ var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
data = elem.getAttribute( name );
View
23 test/unit/data.js
@@ -488,23 +488,26 @@ if (window.JSON && window.JSON.stringify) {
}
test("jQuery.data should follow html5 specification regarding camel casing", function() {
- expect(8);
+ expect(10);
- 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-w-t-f='ftw' data-big-a-little-a='bouncing-b' data-foo='a' data-foo-bar='b' data-foo-bar-baz='c'></div>")
.prependTo("body");
- equals(div.data().foo, "a", "Verify single word data-* key");
- equals(div.data().fooBar, "b", "Verify multiple word data-* key");
- equals(div.data().fooBarBaz, "c", "Verify multiple word data-* key");
+ equal( div.data().wTF, "ftw", "Verify single letter data-* key" );
+ equal( div.data().bigALittleA, "bouncing-b", "Verify single letter mixed data-* key" );
- equals(div.data("foo"), "a", "Verify single word data-* key");
- equals(div.data("fooBar"), "b", "Verify multiple word data-* key");
- equals(div.data("fooBarBaz"), "c", "Verify multiple word data-* key");
+ equal( div.data().foo, "a", "Verify single word data-* key" );
+ equal( div.data().fooBar, "b", "Verify multiple word data-* key" );
+ equal( div.data().fooBarBaz, "c", "Verify multiple word data-* key" );
+
+ equal( div.data("foo"), "a", "Verify single word data-* key" );
+ equal( div.data("fooBar"), "b", "Verify multiple word data-* key" );
+ equal( 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");
+ equal( div.data("fooBar"), "d", "Verify updated data-* key" );
+ equal( div.data("foo-bar"), "d", "Verify updated data-* key" );
div.remove();
});

0 comments on commit 8e8fa6d

Please sign in to comment.
Something went wrong with that request. Please try again.