deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that the data- import also supports arrays.

Browse source
This commit is contained in:
jeresig 2010-09-21 08:20:31 -04:00
parent e7c2d3b45b
commit 1f8a5e4bbc
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data.js
View file

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

6
test/unit/data.js
View file

@ -158,7 +158,7 @@ test(".data(String) and .data(String, Object)", function() {
}); });
test("data-* attributes", function() { test("data-* attributes", function() {
expect(23); expect(24);
var div = jQuery("<div>"), var div = jQuery("<div>"),
child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></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-pointbad", "5..5")
.attr("data-pointbad2", "-.") .attr("data-pointbad2", "-.")
.attr("data-badjson", "{123}") .attr("data-badjson", "{123}")
.attr("data-badjson2", "[abc]")
.attr("data-null", "null") .attr("data-null", "null")
.attr("data-string", "test"); .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('pointbad'), "5..5", "Bad number read from attribute");
equals( child.data('pointbad2'), "-.", "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('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('null'), null, "Primitive null read from attribute");
equals( child.data('string'), "test", "Typical string read from attribute"); equals( child.data('string'), "test", "Typical string read from attribute");
@ -219,7 +221,7 @@ test("data-* attributes", function() {
break; break;
case 3: case 3:
equals(jQuery(elem).data("number"), true, "Check number property"); 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; break;
default: default:
ok(false, ["Assertion failed on index ", index, ", with data ", data].join('')); ok(false, ["Assertion failed on index ", index, ", with data ", data].join(''));