Make sure that the data- import also supports arrays.

diff --git a/src/data.js b/src/data.js
index 44ad0c49e57ae97f8296bb516df1a8d6b468761a..abe46891ddf8d72038a99673e126911e46a02baf 100644 (file)
--- 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 f360daf7f6c28d4aad56a3888fe13e6ca8e5ffa2..f87d7ae4fa8125d18fcff6c3244d0a9f6a42c61d 100644 (file)
--- 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("<div>"),
                child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></div>");
                
@@ -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(''));