library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for .data(Object), overwriting the existing data object. Fixes #4284.

Browse Source
This commit is contained in:
John Resig 2009-12-09 13:16:18 -08:00
parent 4e27f17007
commit f6a0bf6816
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/data.js
View File

@ -37,21 +37,24 @@ jQuery.extend({
// Avoid generating a new cache unless none exists and we // Avoid generating a new cache unless none exists and we
// want to manipulate it. // want to manipulate it.
if ( cache[ id ] ) { if ( typeof name === "object" ) {
elem[ expando ] = id;
thisCache = cache[ id ] = jQuery.extend(true, {}, name);
} else if ( cache[ id ] ) {
thisCache = cache[ id ]; thisCache = cache[ id ];
} else if ( typeof data === "undefined" ) { } else if ( typeof data === "undefined" ) {
thisCache = emptyObject; thisCache = emptyObject;
} else { } else {
thisCache = cache[ id ] = {}; thisCache = cache[ id ] = {};
} }
// Prevent overriding the named cache with undefined values // Prevent overriding the named cache with undefined values
if ( data !== undefined ) { if ( data !== undefined ) {
elem[ expando ] = id; elem[ expando ] = id;
thisCache[ name ] = data; thisCache[ name ] = data;
} }
return name ? thisCache[ name ] : thisCache; return typeof name === "string" ? thisCache[ name ] : thisCache;
}, },
removeData: function( elem, name ) { removeData: function( elem, name ) {
@ -100,6 +103,11 @@ jQuery.fn.extend({
data: function( key, value ){ data: function( key, value ){
if ( typeof key === "undefined" && this.length ) { if ( typeof key === "undefined" && this.length ) {
return jQuery.data( this[0] ); return jQuery.data( this[0] );
} else if ( typeof key === "object" ) {
return this.each(function() {
jQuery.data( this, key );
});
} }
var parts = key.split("."); var parts = key.split(".");

16
test/unit/data.js
View File

@ -25,7 +25,7 @@ test("expando", function(){
}); });
test("jQuery.data", function() { test("jQuery.data", function() {
expect(6); expect(8);
var div = jQuery("#foo")[0]; var div = jQuery("#foo")[0];
equals( jQuery.data(div, "test"), undefined, "Check for no data exists" ); equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
@ -43,6 +43,10 @@ test("jQuery.data", function() {
jQuery.data(div, "test", null); jQuery.data(div, "test", null);
ok( jQuery.data(div, "test") === null, "Check for null data"); ok( jQuery.data(div, "test") === null, "Check for null data");
jQuery.data(div, { "test": "in", "test2": "in2" });
equals( jQuery.data(div, "test"), "in", "Verify setting an object in data." );
equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data." );
}); });
test(".data()", function() { test(".data()", function() {
@ -114,6 +118,16 @@ test(".data(String) and .data(String, Object)", function() {
$elem.removeData(); $elem.removeData();
}); });
test(".data(Object)", function() {
expect(2);
var div = jQuery("<div/>");
div.data({ "test": "in", "test2": "in2" });
equals( div.data("test"), "in", "Verify setting an object in data." );
equals( div.data("test2"), "in2", "Verify setting an object in data." );
});
test("jQuery.removeData", function() { test("jQuery.removeData", function() {
expect(1); expect(1);
var div = jQuery("#foo")[0]; var div = jQuery("#foo")[0];