diff --git a/src/core.js b/src/core.js index 6ba437662..46c69b6c1 100644 --- a/src/core.js +++ b/src/core.js @@ -29,7 +29,7 @@ var // Matches dashed string for camelizing rmsPrefix = /^-ms-/, - rdashAlpha = /-([a-z])/gi, + rdashAlpha = /-([\da-z])/gi, // Used by jQuery.camelCase as callback to replace() fcamelCase = function( all, letter ) { diff --git a/test/unit/core.js b/test/unit/core.js index d1e618c8b..472c4b5af 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -1648,7 +1648,7 @@ QUnit.test( "jQuery.camelCase()", function( assert ) { "foo-bar": "fooBar", "foo-bar-baz": "fooBarBaz", "girl-u-want": "girlUWant", - "the-4th-dimension": "the-4thDimension", + "the-4th-dimension": "the4thDimension", "-o-tannenbaum": "OTannenbaum", "-moz-illa": "MozIlla", "-ms-take": "msTake" diff --git a/test/unit/data.js b/test/unit/data.js index 91002b8a0..c402e20bb 100644 --- a/test/unit/data.js +++ b/test/unit/data.js @@ -373,51 +373,30 @@ QUnit.test( "jQuery(plain Object).data(String, Object).data(String)", function( } ); QUnit.test( "data-* attributes", function( assert ) { - assert.expect( 46 ); + assert.expect( 43 ); var prop, i, l, metadata, elem, obj, obj2, check, num, num2, parseJSON = jQuery.parseJSON, - div = jQuery( "
" ), - child = jQuery( - "
" - ), - dummy = jQuery( - "
" - ); + div = jQuery("
"), + child = jQuery("
"), + dummy = jQuery("
"); - assert.equal( - div.data( "attr" ), undefined, "Check for non-existing data-attr attribute" - ); + equal( div.data("attr"), undefined, "Check for non-existing data-attr attribute" ); - div.attr( "data-attr", "exists" ); - assert.equal( - div.data( "attr" ), "exists", "Check for existing data-attr attribute" - ); + div.attr("data-attr", "exists"); + equal( div.data("attr"), "exists", "Check for existing data-attr attribute" ); - div.attr( "data-attr", "exists2" ); - assert.equal( - div.data( "attr" ), "exists", "Check that updates to data- don't update .data()" - ); + div.attr("data-attr", "exists2"); + equal( div.data("attr"), "exists", "Check that updates to data- don't update .data()" ); - div.data( "attr", "internal" ).attr( "data-attr", "external" ); - assert.equal( - div.data( "attr" ), - "internal", - "Check for .data('attr') precedence (internal > external data-* attribute)" - ); + div.data("attr", "internal").attr("data-attr", "external"); + equal( div.data("attr"), "internal", "Check for .data('attr') precedence (internal > external data-* attribute)" ); div.remove(); - child.appendTo( "#qunit-fixture" ); - assert.equal( - child.data( "myobj" ), "old data", "Value accessed from data-* attribute" - ); - assert.equal( - child.data( "foo-42" ), "boosh", "camelCasing does not affect numbers (#1751)" - ); + child.appendTo("#qunit-fixture"); + equal( child.data("myobj"), "old data", "Value accessed from data-* attribute"); child.data( "myobj", "replaced" ); assert.equal( @@ -431,7 +410,7 @@ QUnit.test( "data-* attributes", function( assert ) { obj = child.data(); obj2 = dummy.data(); - check = [ "myobj", "ignored", "other", "foo-42" ]; + check = [ "myobj", "ignored", "other" ]; num = 0; num2 = 0;