From e0b24306a86629f02576017f25d295fbe07f21a5 Mon Sep 17 00:00:00 2001 From: jeresig Date: Tue, 21 Sep 2010 08:30:12 -0400 Subject: [PATCH] Handle some additional data- number edge cases. --- src/data.js | 2 +- test/unit/data.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/data.js b/src/data.js index abe4689..dc08a56 100644 --- a/src/data.js +++ b/src/data.js @@ -1,7 +1,7 @@ (function( jQuery ) { var windowData = {}, - rnum = /^-?\d+(?:\.\d+)$/, + rnum = /^-?\d+(?:\.\d+)?(?:E\d+)?$/, rbrace = /^(?:{.*}|\[.*\])$/; jQuery.extend({ diff --git a/test/unit/data.js b/test/unit/data.js index f87d7ae..058f23f 100644 --- a/test/unit/data.js +++ b/test/unit/data.js @@ -158,7 +158,7 @@ test(".data(String) and .data(String, Object)", function() { }); test("data-* attributes", function() { - expect(24); + expect(25); var div = jQuery("
"), child = jQuery("
"); @@ -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(); -- 1.7.10.4