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

Make sure that undefined is always returned for undefined data properties. Fixes #6166.

Browse source
This commit is contained in:
jeresig 2010-02-26 12:35:04 -05:00
parent 7f5179b654
commit 9e06903a99
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data.js
View file

@ -25,7 +25,7 @@ jQuery.extend({
var id = elem[ expando ], cache = jQuery.cache, thisCache; var id = elem[ expando ], cache = jQuery.cache, thisCache;
if ( !id && typeof name === "string" && data === undefined ) { if ( !id && typeof name === "string" && data === undefined ) {
return null; return;
} }
// Compute a unique ID for the element // Compute a unique ID for the element

22
test/unit/data.js
View file

@ -24,13 +24,16 @@ test("expando", function(){
}); });
test("jQuery.data", function() { test("jQuery.data", function() {
expect(8); expect(9);
var div = jQuery("#foo")[0]; var div = document.createElement("div");
equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
ok( jQuery.data(div, "test") === undefined, "Check for no data exists" );
jQuery.data(div, "test", "success"); jQuery.data(div, "test", "success");
equals( jQuery.data(div, "test"), "success", "Check for added data" ); equals( jQuery.data(div, "test"), "success", "Check for added data" );
ok( jQuery.data(div, "notexist") === undefined, "Check for no data exists" );
var data = jQuery.data(div); var data = jQuery.data(div);
same( data, { "test": "success" }, "Return complete data set" ); same( data, { "test": "success" }, "Return complete data set" );
@ -57,18 +60,25 @@ test(".data()", function() {
}) })
test(".data(String) and .data(String, Object)", function() { test(".data(String) and .data(String, Object)", function() {
expect(22); expect(23);
var div = jQuery("#foo"); var div = jQuery("<div/>");
equals( div.data("test"), undefined, "Check for no data exists" );
ok( div.data("test") === undefined, "Check for no data exists" );
div.data("test", "success"); div.data("test", "success");
equals( div.data("test"), "success", "Check for added data" ); equals( div.data("test"), "success", "Check for added data" );
div.data("test", "overwritten"); div.data("test", "overwritten");
equals( div.data("test"), "overwritten", "Check for overwritten data" ); equals( div.data("test"), "overwritten", "Check for overwritten data" );
div.data("test", undefined); div.data("test", undefined);
equals( div.data("test"), "overwritten", "Check that data wasn't removed"); equals( div.data("test"), "overwritten", "Check that data wasn't removed");
div.data("test", null); div.data("test", null);
ok( div.data("test") === null, "Check for null data"); ok( div.data("test") === null, "Check for null data");
ok( div.data("notexist") === undefined, "Check for no data exists" );
div.data("test", "overwritten"); div.data("test", "overwritten");
var hits = {test:0}, gets = {test:0}; var hits = {test:0}, gets = {test:0};