git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42568db
)
Attach data directly to plain objects, no reason to use the central jQuery.cache...
author
jeresig
<jeresig@gmail.com>
Sat, 27 Feb 2010 14:49:58 +0000
(09:49 -0500)
committer
jeresig
<jeresig@gmail.com>
Sat, 27 Feb 2010 14:49:58 +0000
(09:49 -0500)
src/data.js
patch
|
blob
|
history
test/unit/data.js
patch
|
blob
|
history
diff --git
a/src/data.js
b/src/data.js
index
a97ac04
..
109d556
100644
(file)
--- a/
src/data.js
+++ b/
src/data.js
@@
-3,7
+3,7
@@
var expando = "jQuery" + now(), uuid = 0, windowData = {};
jQuery.extend({
cache: {},
jQuery.extend({
cache: {},
- expando:expando,
+ expando: expando,
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
@@
-22,25
+22,29
@@
jQuery.extend({
windowData :
elem;
windowData :
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 ) {
return;
}
if ( !id && typeof name === "string" && data === undefined ) {
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 ) {
- id = ++uuid;
+ } else if ( !id ) {
+ elem[ jQuery.expando ] = id = ++uuid;
}
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
if ( typeof name === "object" ) {
}
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
if ( typeof name === "object" ) {
- elem[ expando ] = id;
- thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+ 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 :
elem;
windowData :
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 ( name ) {
// If we want to remove a specific section of the element's data
if ( name ) {
@@
-79,7
+84,7
@@
jQuery.extend({
// Otherwise, we want to remove all of the element's data
} else {
// Otherwise, we want to remove all of the element's data
} else {
- if ( jQuery.support.deleteExpando ) {
+ if ( jQuery.support.deleteExpando || !isNode ) {
delete elem[ jQuery.expando ];
} else if ( elem.removeAttribute ) {
delete elem[ jQuery.expando ];
} 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 ];
+ }
}
}
});
}
}
});
diff --git
a/test/unit/data.js
b/test/unit/data.js
index
0d75bc4
..
11bce4d
100644
(file)
--- a/
test/unit/data.js
+++ b/
test/unit/data.js
@@
-18,13
+18,13
@@
test("expando", function(){
equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
var id = obj[jQuery.expando];
equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
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");
ok( jQuery.data(div, "test") === undefined, "Check for no data exists" );
var div = document.createElement("div");
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" });
equals( jQuery.data(div, "test"), "in", "Verify setting an object in data." );
equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in 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." );
+
+ 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() {