library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #13815: Ensure each element has its own private data object - Tests by @rwldrn

Browse Source
This commit is contained in:
Corey Frang 2013-04-24 16:07:15 -04:00
parent 3a6194076b
commit 55e319aa52
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/data.js
View File

@ -90,13 +90,9 @@ Data.prototype = {
// Handle: [ owner, { properties } ] args // Handle: [ owner, { properties } ] args
} else { } else {
// Support an expectation from the old data system where plain // Fresh assignments by object are shallow copied
// objects used to initialize would be set to the cache by
// reference, instead of having properties and values copied.
// Note, this will kill the connection between
// "this.cache[ unlock ]" and "cache"
if ( jQuery.isEmptyObject( cache ) ) { if ( jQuery.isEmptyObject( cache ) ) {
this.cache[ unlock ] = data; jQuery.extend( this.cache[ unlock ], data );
// Otherwise, copy the properties one-by-one to the cache object // Otherwise, copy the properties one-by-one to the cache object
} else { } else {
for ( prop in data ) { for ( prop in data ) {
@ -104,6 +100,7 @@ Data.prototype = {
} }
} }
} }
return cache;
}, },
get: function( owner, key ) { get: function( owner, key ) {
// Either a valid cache is found, or will be created. // Either a valid cache is found, or will be created.

4
src/manipulation.js
View File

@ -527,11 +527,9 @@ function cloneCopyEvent( src, dest ) {
// 1. Copy private data: events, handlers, etc. // 1. Copy private data: events, handlers, etc.
if ( data_priv.hasData( src ) ) { if ( data_priv.hasData( src ) ) {
pdataOld = data_priv.access( src ); pdataOld = data_priv.access( src );
pdataCur = jQuery.extend( {}, pdataOld ); pdataCur = data_priv.set( dest, pdataOld );
events = pdataOld.events; events = pdataOld.events;
data_priv.set( dest, pdataCur );
if ( events ) { if ( events ) {
delete pdataCur.handle; delete pdataCur.handle;
pdataCur.events = {}; pdataCur.events = {};

12
test/unit/data.js
View File

@ -244,6 +244,18 @@ test("jQuery(plain Object).data(String, Object).data(String)", function() {
deepEqual( $obj[0], { exists: true }, "removeData does not clear the object" ); deepEqual( $obj[0], { exists: true }, "removeData does not clear the object" );
}); });
test(".data(object) does not retain references. #13815", function() {
expect( 2 );
var $divs = jQuery("<div></div><div></div>").appendTo("#qunit-fixture");
$divs.data({ "type": "foo" });
$divs.eq( 0 ).data( "type", "bar" );
equal( $divs.eq( 0 ).data("type"), "bar", "Correct updated value" );
equal( $divs.eq( 1 ).data("type"), "foo", "Original value retained" );
});
test("data-* attributes", function() { test("data-* attributes", function() {
expect(40); expect(40);
var prop, i, l, metadata, elem, var prop, i, l, metadata, elem,