From 1f8a5e4bbc49c244051101765c46bd8f35e2aa32 Mon Sep 17 00:00:00 2001 From: jeresig Date: Tue, 21 Sep 2010 08:20:31 -0400 Subject: [PATCH] Make sure that the data- import also supports arrays. --- src/data.js | 2 +- test/unit/data.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/data.js b/src/data.js index 44ad0c49..abe46891 100644 --- a/src/data.js +++ b/src/data.js @@ -2,7 +2,7 @@ var windowData = {}, rnum = /^-?\d+(?:\.\d+)$/, - rbrace = /^{.*}$/; + rbrace = /^(?:{.*}|\[.*\])$/; jQuery.extend({ cache: {}, diff --git a/test/unit/data.js b/test/unit/data.js index f360daf7..f87d7ae4 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(23); + expect(24); var div = jQuery("
"), child = jQuery("
"); @@ -187,6 +187,7 @@ test("data-* attributes", function() { .attr("data-pointbad", "5..5") .attr("data-pointbad2", "-.") .attr("data-badjson", "{123}") + .attr("data-badjson2", "[abc]") .attr("data-null", "null") .attr("data-string", "test"); @@ -197,6 +198,7 @@ test("data-* attributes", function() { 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"); @@ -219,7 +221,7 @@ test("data-* attributes", function() { break; case 3: equals(jQuery(elem).data("number"), true, "Check number property"); - equals(jQuery(elem).data("stuff"), "[2,8]", "Check stuff property"); + same(jQuery(elem).data("stuff"), [2,8], "Check stuff property"); break; default: ok(false, ["Assertion failed on index ", index, ", with data ", data].join(''));