Handle some additional data- number edge cases.

This commit is contained in:
jeresig 2010-09-21 08:30:12 -04:00
parent 1f8a5e4bbc
commit e0b24306a8
2 changed files with 14 additions and 12 deletions

View file

@ -1,7 +1,7 @@
(function( jQuery ) {
var windowData = {},
rnum = /^-?\d+(?:\.\d+)$/,
rnum = /^-?\d+(?:\.\d+)?(?:E\d+)?$/,
rbrace = /^(?:{.*}|\[.*\])$/;
jQuery.extend({

View file

@ -158,7 +158,7 @@ test(".data(String) and .data(String, Object)", function() {
});
test("data-* attributes", function() {
expect(24);
expect(25);
var div = jQuery("<div>"),
child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></div>");
@ -184,6 +184,7 @@ test("data-* attributes", function() {
.attr("data-false", "false")
.attr("data-five", "5")
.attr("data-point", "5.5")
.attr("data-pointe", "5.5E3")
.attr("data-pointbad", "5..5")
.attr("data-pointbad2", "-.")
.attr("data-badjson", "{123}")
@ -191,16 +192,17 @@ test("data-* attributes", function() {
.attr("data-null", "null")
.attr("data-string", "test");
equals( child.data('true'), true, "Primitive true read from attribute");
equals( child.data('false'), false, "Primitive false read from attribute");
equals( child.data('five'), 5, "Primitive number read from attribute");
equals( child.data('point'), 5.5, "Primitive number read from attribute");
equals( child.data('pointbad'), "5..5", "Bad number read from attribute");
equals( child.data('pointbad2'), "-.", "Bad number read from attribute");
equals( child.data('badjson'), "{123}", "Bad number read from attribute");
equals( child.data('badjson2'), "[abc]", "Bad number read from attribute");
equals( child.data('null'), null, "Primitive null read from attribute");
equals( child.data('string'), "test", "Typical string read from attribute");
strictEqual( child.data('true'), true, "Primitive true read from attribute");
strictEqual( child.data('false'), false, "Primitive false read from attribute");
strictEqual( child.data('five'), 5, "Primitive number read from attribute");
strictEqual( child.data('point'), 5.5, "Primitive number read from attribute");
strictEqual( child.data('pointe'), 5500, "Primitive number read from attribute");
strictEqual( child.data('pointbad'), "5..5", "Bad number read from attribute");
strictEqual( child.data('pointbad2'), "-.", "Bad number read from attribute");
strictEqual( child.data('badjson'), "{123}", "Bad number read from attribute");
strictEqual( child.data('badjson2'), "[abc]", "Bad number read from attribute");
strictEqual( child.data('null'), null, "Primitive null read from attribute");
strictEqual( child.data('string'), "test", "Typical string read from attribute");
child.remove();