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

Attach data directly to plain objects, no reason to use the central jQuery.cache. Fixes #6189.

Browse source
This commit is contained in:
jeresig 2010-02-27 09:49:58 -05:00
parent 42568db4c4
commit a49e6b6313
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/data.js
View file

@ -3,7 +3,7 @@ var expando = "jQuery" + now(), uuid = 0, windowData = {};
jQuery.extend({ jQuery.extend({
cache: {}, cache: {},
expando:expando, expando: expando,
// The following elements throw uncatchable exceptions if you // The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them. // attempt to add expando properties to them.
@ -22,25 +22,29 @@ jQuery.extend({
windowData : windowData :
elem; elem;
var id = elem[ expando ], cache = jQuery.cache, thisCache; var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
isNode = elem.nodeType;
if ( !id && typeof name === "string" && data === undefined ) { if ( !id && typeof name === "string" && data === undefined ) {
return; return;
} }
// Get the data from the object directly
if ( !isNode ) {
cache = elem;
id = jQuery.expando;
// Compute a unique ID for the element // Compute a unique ID for the element
if ( !id ) { } else if ( !id ) {
id = ++uuid; elem[ jQuery.expando ] = id = ++uuid;
} }
// 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 ( typeof name === "object" ) { if ( typeof name === "object" ) {
elem[ expando ] = id; cache[ id ] = jQuery.extend(true, {}, name);
thisCache = cache[ id ] = jQuery.extend(true, {}, name);
} else if ( !cache[ id ] ) { } else if ( !cache[ id ] ) {
elem[ expando ] = id;
cache[ id ] = {}; cache[ id ] = {};
} }
@ -63,7 +67,8 @@ jQuery.extend({
windowData : windowData :
elem; elem;
var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; var id = elem[ jQuery.expando ], cache = jQuery.cache,
isNode = elem.nodeType, thisCache = isNode ? cache[ id ] : id;
// If we want to remove a specific section of the element's data // If we want to remove a specific section of the element's data
if ( name ) { if ( name ) {
@ -79,7 +84,7 @@ jQuery.extend({
// Otherwise, we want to remove all of the element's data // Otherwise, we want to remove all of the element's data
} else { } else {
if ( jQuery.support.deleteExpando ) { if ( jQuery.support.deleteExpando || !isNode ) {
delete elem[ jQuery.expando ]; delete elem[ jQuery.expando ];
} else if ( elem.removeAttribute ) { } else if ( elem.removeAttribute ) {
@ -87,7 +92,9 @@ jQuery.extend({
} }
// Completely remove the data cache // Completely remove the data cache
delete cache[ id ]; if ( isNode ) {
delete cache[ id ];
}
} }
} }
}); });

14
test/unit/data.js
View file

@ -18,13 +18,13 @@ test("expando", function(){
equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" ); equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
var id = obj[jQuery.expando]; var id = obj[jQuery.expando];
equals( id in jQuery.cache, true, "jQuery.data added an entry to jQuery.cache" ); equals( id in jQuery.cache, false, "jQuery.data did not add an entry to jQuery.cache" );
equals( jQuery.cache[id].foo, "bar", "jQuery.data worked correctly" ); equals( id.foo, "bar", "jQuery.data worked correctly" );
}); });
test("jQuery.data", function() { test("jQuery.data", function() {
expect(9); expect(12);
var div = document.createElement("div"); var div = document.createElement("div");
ok( jQuery.data(div, "test") === undefined, "Check for no data exists" ); ok( jQuery.data(div, "test") === undefined, "Check for no data exists" );
@ -49,6 +49,14 @@ test("jQuery.data", function() {
jQuery.data(div, { "test": "in", "test2": "in2" }); jQuery.data(div, { "test": "in", "test2": "in2" });
equals( jQuery.data(div, "test"), "in", "Verify setting an object in data." ); equals( jQuery.data(div, "test"), "in", "Verify setting an object in data." );
equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data." ); equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data." );
var obj = {};
jQuery.data( obj, "prop", true );
ok( obj[ jQuery.expando ], "Data is being stored on the object." );
ok( obj[ jQuery.expando ].prop, "Data is being stored on the object." );
equals( jQuery.data( obj, "prop" ), true, "Make sure the right value is retrieved." );
}); });
test(".data()", function() { test(".data()", function() {