Commit 08e13454 authored by carldanley's avatar carldanley Committed by Rick Waldron

Create private methods for processing data/removeData requests. Fixes #12519, Closes gh-976

parent 2e3ca6ca
var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
rmultiDash = /([A-Z])/g; rmultiDash = /([A-Z])/g;
function internalData( elem, name, data, pvt /* Internal Use Only */ ){
if ( !jQuery.acceptData( elem ) ) {
return;
}
jQuery.extend({ var thisCache, ret,
cache: {}, internalKey = jQuery.expando,
getByName = typeof name === "string",
deletedIds: [], // We have to handle DOM nodes and JS objects differently because IE6-7
// can't GC object references properly across the DOM-JS boundary
isNode = elem.nodeType,
// Remove at next major release (1.9/2.0) // Only DOM nodes need the global jQuery cache; JS object data is
uuid: 0, // attached directly to the object so GC can occur automatically
cache = isNode ? jQuery.cache : elem,
// Unique for each copy of jQuery on the page // Only defining an ID for JS objects if its cache already exists allows
// Non-digits removed to match rinlinejQuery // the code to shortcut on the same path as a DOM node with no cache
expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
// The following elements throw uncatchable exceptions if you // Avoid doing any more work than we need to when trying to get data on an
// attempt to add expando properties to them. // object that has no data at all
noData: { if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
"embed": true, return;
// Ban all objects except for Flash (which handle expandos) }
"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
"applet": true
},
hasData: function( elem ) {
elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
return !!elem && !isEmptyDataObject( elem );
},
data: function( elem, name, data, pvt /* Internal Use Only */ ) { if ( !id ) {
if ( !jQuery.acceptData( elem ) ) { // Only DOM nodes need a new unique ID for each element since their data
return; // ends up in the global cache
if ( isNode ) {
elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
} else {
id = internalKey;
} }
}
var thisCache, ret, if ( !cache[ id ] ) {
internalKey = jQuery.expando, cache[ id ] = {};
getByName = typeof name === "string",
// We have to handle DOM nodes and JS objects differently because IE6-7
// can't GC object references properly across the DOM-JS boundary
isNode = elem.nodeType,
// Only DOM nodes need the global jQuery cache; JS object data is
// attached directly to the object so GC can occur automatically
cache = isNode ? jQuery.cache : elem,
// Only defining an ID for JS objects if its cache already exists allows
// the code to shortcut on the same path as a DOM node with no cache
id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
// Avoid doing any more work than we need to when trying to get data on an // Avoids exposing jQuery metadata on plain JS objects when the object
// object that has no data at all // is serialized using JSON.stringify
if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) { if ( !isNode ) {
return; cache[ id ].toJSON = jQuery.noop;
} }
}
if ( !id ) { // An object can be passed to jQuery.data instead of a key/value pair; this gets
// Only DOM nodes need a new unique ID for each element since their data // shallow copied over onto the existing cache
// ends up in the global cache if ( typeof name === "object" || typeof name === "function" ) {
if ( isNode ) { if ( pvt ) {
elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++; cache[ id ] = jQuery.extend( cache[ id ], name );
} else { } else {
id = internalKey; cache[ id ].data = jQuery.extend( cache[ id ].data, name );
}
} }
}
if ( !cache[ id ] ) { thisCache = cache[ id ];
cache[ id ] = {};
// Avoids exposing jQuery metadata on plain JS objects when the object // jQuery data() is stored in a separate object inside the object's internal data
// is serialized using JSON.stringify // cache in order to avoid key collisions between internal data and user-defined
if ( !isNode ) { // data.
cache[ id ].toJSON = jQuery.noop; if ( !pvt ) {
} if ( !thisCache.data ) {
thisCache.data = {};
} }
// An object can be passed to jQuery.data instead of a key/value pair; this gets thisCache = thisCache.data;
// shallow copied over onto the existing cache }
if ( typeof name === "object" || typeof name === "function" ) {
if ( pvt ) {
cache[ id ] = jQuery.extend( cache[ id ], name );
} else {
cache[ id ].data = jQuery.extend( cache[ id ].data, name );
}
}
thisCache = cache[ id ];
// jQuery data() is stored in a separate object inside the object's internal data
// cache in order to avoid key collisions between internal data and user-defined
// data.
if ( !pvt ) {
if ( !thisCache.data ) {
thisCache.data = {};
}
thisCache = thisCache.data;
}
if ( data !== undefined ) { if ( data !== undefined ) {
thisCache[ jQuery.camelCase( name ) ] = data; thisCache[ jQuery.camelCase( name ) ] = data;
} }
// Check for both converted-to-camel and non-converted data property names // Check for both converted-to-camel and non-converted data property names
// If a data property was specified // If a data property was specified
if ( getByName ) { if ( getByName ) {
// First Try to find as-is property data // First Try to find as-is property data
ret = thisCache[ name ]; ret = thisCache[ name ];
// Test for null|undefined property data // Test for null|undefined property data
if ( ret == null ) { if ( ret == null ) {
// Try to find the camelCased property // Try to find the camelCased property
ret = thisCache[ jQuery.camelCase( name ) ]; ret = thisCache[ jQuery.camelCase( name ) ];
}
} else {
ret = thisCache;
} }
} else {
ret = thisCache;
}
return ret; return ret;
}, }
removeData: function( elem, name, pvt /* Internal Use Only */ ) { function internalRemoveData( elem, name, pvt /* For internal use only */ ){
if ( !jQuery.acceptData( elem ) ) { if ( !jQuery.acceptData( elem ) ) {
return; return;
} }
var thisCache, i, l, var thisCache, i, l,
isNode = elem.nodeType, isNode = elem.nodeType,
// See jQuery.data for more information // See jQuery.data for more information
cache = isNode ? jQuery.cache : elem, cache = isNode ? jQuery.cache : elem,
id = isNode ? elem[ jQuery.expando ] : jQuery.expando; id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
// If there is already no cache entry for this object, there is no // If there is already no cache entry for this object, there is no
// purpose in continuing // purpose in continuing
if ( !cache[ id ] ) { if ( !cache[ id ] ) {
return; return;
} }
if ( name ) { if ( name ) {
thisCache = pvt ? cache[ id ] : cache[ id ].data; thisCache = pvt ? cache[ id ] : cache[ id ].data;
if ( thisCache ) { if ( thisCache ) {
// Support array or space separated string names for data keys // Support array or space separated string names for data keys
if ( !jQuery.isArray( name ) ) { if ( !jQuery.isArray( name ) ) {
// try the string as a key before any manipulation // try the string as a key before any manipulation
if ( name in thisCache ) {
name = [ name ];
} else {
// split the camel cased version by spaces unless a key with the spaces exists
name = jQuery.camelCase( name );
if ( name in thisCache ) { if ( name in thisCache ) {
name = [ name ]; name = [ name ];
} else { } else {
name = name.split(" ");
// split the camel cased version by spaces unless a key with the spaces exists
name = jQuery.camelCase( name );
if ( name in thisCache ) {
name = [ name ];
} else {
name = name.split(" ");
}
} }
} }
}
for ( i = 0, l = name.length; i < l; i++ ) { for ( i = 0, l = name.length; i < l; i++ ) {
delete thisCache[ name[i] ]; delete thisCache[ name[i] ];
} }
// If there is no data left in the cache, we want to continue // If there is no data left in the cache, we want to continue
// and let the cache object itself get destroyed // and let the cache object itself get destroyed
if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
return; return;
}
} }
} }
}
// See jQuery.data for more information // See jQuery.data for more information
if ( !pvt ) { if ( !pvt ) {
delete cache[ id ].data; delete cache[ id ].data;
// Don't destroy the parent cache unless the internal data object // Don't destroy the parent cache unless the internal data object
// had been the only thing left in it // had been the only thing left in it
if ( !isEmptyDataObject( cache[ id ] ) ) { if ( !isEmptyDataObject( cache[ id ] ) ) {
return; return;
}
} }
}
// Destroy the cache // Destroy the cache
if ( isNode ) { if ( isNode ) {
jQuery.cleanData( [ elem ], true ); jQuery.cleanData( [ elem ], true );
// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
} else if ( jQuery.support.deleteExpando || cache != cache.window ) { } else if ( jQuery.support.deleteExpando || cache != cache.window ) {
delete cache[ id ]; delete cache[ id ];
// When all else fails, null // When all else fails, null
} else { } else {
cache[ id ] = null; cache[ id ] = null;
} }
}
jQuery.extend({
cache: {},
deletedIds: [],
// Remove at next major release (1.9/2.0)
uuid: 0,
// Unique for each copy of jQuery on the page
// Non-digits removed to match rinlinejQuery
expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
noData: {
"embed": true,
// Ban all objects except for Flash (which handle expandos)
"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
"applet": true
},
hasData: function( elem ) {
elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
return !!elem && !isEmptyDataObject( elem );
},
data: function( elem, name, data ) {
return internalData( elem, name, data, false );
},
removeData: function( elem, name ) {
return internalRemoveData( elem, name, false );
}, },
// For internal use only. // For internal use only.
_data: function( elem, name, data ) { _data: function( elem, name, data ) {
return jQuery.data( elem, name, data, true ); return internalData( elem, name, data, true );
},
_removeData: function( elem, name ) {
return internalRemoveData( elem, name, true );
}, },
// A method for determining if a DOM node can handle the data expando // A method for determining if a DOM node can handle the data expando
......
...@@ -327,7 +327,7 @@ function defaultPrefilter( elem, props, opts ) { ...@@ -327,7 +327,7 @@ function defaultPrefilter( elem, props, opts ) {
} }
anim.done(function() { anim.done(function() {
var prop; var prop;
jQuery.removeData( elem, "fxshow", true ); jQuery._removeData( elem, "fxshow" );
for ( prop in orig ) { for ( prop in orig ) {
jQuery.style( elem, prop, orig[ prop ] ); jQuery.style( elem, prop, orig[ prop ] );
} }
......
...@@ -15,7 +15,6 @@ var rformElems = /^(?:textarea|input|select)$/i, ...@@ -15,7 +15,6 @@ var rformElems = /^(?:textarea|input|select)$/i,
jQuery.event = { jQuery.event = {
add: function( elem, types, handler, data, selector ) { add: function( elem, types, handler, data, selector ) {
var elemData, eventHandle, events, var elemData, eventHandle, events,
t, tns, type, namespaces, handleObj, t, tns, type, namespaces, handleObj,
handleObjIn, handlers, special; handleObjIn, handlers, special;
...@@ -196,7 +195,7 @@ jQuery.event = { ...@@ -196,7 +195,7 @@ jQuery.event = {
// removeData also checks for emptiness and clears the expando if empty // removeData also checks for emptiness and clears the expando if empty
// so use it instead of delete // so use it instead of delete
jQuery.removeData( elem, "events", true ); jQuery._removeData( elem, "events" );
} }
}, },
......
...@@ -58,8 +58,8 @@ jQuery.extend({ ...@@ -58,8 +58,8 @@ jQuery.extend({
var key = type + "queueHooks"; var key = type + "queueHooks";
return jQuery._data( elem, key ) || jQuery._data( elem, key, { return jQuery._data( elem, key ) || jQuery._data( elem, key, {
empty: jQuery.Callbacks("once memory").add(function() { empty: jQuery.Callbacks("once memory").add(function() {
jQuery.removeData( elem, type + "queue", true ); jQuery._removeData( elem, type + "queue" );
jQuery.removeData( elem, key, true ); jQuery._removeData( elem, key );
}) })
}); });
} }
......
...@@ -19,7 +19,7 @@ function dataTests (elem) { ...@@ -19,7 +19,7 @@ function dataTests (elem) {
} }
var oldCacheLength, dataObj, internalDataObj, expected, actual; var oldCacheLength, dataObj, internalDataObj, expected, actual;
equal( jQuery.data(elem, "foo"), undefined, "No data exists initially" ); equal( jQuery.data(elem, "foo"), undefined, "No data exists initially" );
strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees no data exists initially" ); strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees no data exists initially" );
...@@ -50,7 +50,7 @@ function dataTests (elem) { ...@@ -50,7 +50,7 @@ function dataTests (elem) {
strictEqual( jQuery.data(elem, "foo"), "foo1", "Passing an object extends the data object instead of replacing it" ); strictEqual( jQuery.data(elem, "foo"), "foo1", "Passing an object extends the data object instead of replacing it" );
equal( jQuery.data(elem, "boom"), "bloz", "Extending the data object works" ); equal( jQuery.data(elem, "boom"), "bloz", "Extending the data object works" );
jQuery._data(elem, "foo", "foo2"); jQuery._data(elem, "foo", "foo2", true);
equal( jQuery._data(elem, "foo"), "foo2", "Setting internal data works" ); equal( jQuery._data(elem, "foo"), "foo2", "Setting internal data works" );
equal( jQuery.data(elem, "foo"), "foo1", "Setting internal data does not override user data" ); equal( jQuery.data(elem, "foo"), "foo1", "Setting internal data does not override user data" );
...@@ -66,9 +66,9 @@ function dataTests (elem) { ...@@ -66,9 +66,9 @@ function dataTests (elem) {
jQuery.removeData(elem); jQuery.removeData(elem);
strictEqual( jQuery._data(elem), internalDataObj, "jQuery.removeData does not remove internal data if it exists" ); strictEqual( jQuery._data(elem), internalDataObj, "jQuery.removeData does not remove internal data if it exists" );
jQuery.removeData(elem, undefined, true); jQuery._removeData(elem);
strictEqual( jQuery.data(elem, jQuery.expando), undefined, "jQuery.removeData on internal data works" ); strictEqual( jQuery._data(elem, jQuery.expando), undefined, "jQuery.removeData on internal data works" );
strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees all data has been removed from object" ); strictEqual( jQuery.hasData(elem), false, "jQuery.hasData agrees all data has been removed from object" );
jQuery._data(elem, "foo", "foo2"); jQuery._data(elem, "foo", "foo2");
...@@ -79,7 +79,7 @@ function dataTests (elem) { ...@@ -79,7 +79,7 @@ function dataTests (elem) {
// delete the last private data key so we can test removing public data // delete the last private data key so we can test removing public data
// will destroy the cache // will destroy the cache
jQuery.removeData( elem, "foo", true ); jQuery._removeData( elem, "foo" );
if (elem.nodeType) { if (elem.nodeType) {
oldCacheLength = getCacheLength(); oldCacheLength = getCacheLength();
...@@ -109,9 +109,9 @@ function dataTests (elem) { ...@@ -109,9 +109,9 @@ function dataTests (elem) {
equal( jQuery.data(elem, "foo"), "foo1", "(sanity check) Ensure data is set in user data object" ); equal( jQuery.data(elem, "foo"), "foo1", "(sanity check) Ensure data is set in user data object" );
equal( jQuery._data(elem, "foo"), "foo2", "(sanity check) Ensure data is set in internal data object" ); equal( jQuery._data(elem, "foo"), "foo2", "(sanity check) Ensure data is set in internal data object" );
jQuery.removeData(elem, "foo", true); jQuery._removeData(elem, "foo");
strictEqual( jQuery.data(elem, jQuery.expando), undefined, "Removing the last item in internal data destroys the internal data object" ); strictEqual( jQuery._data(elem, jQuery.expando), undefined, "Removing the last item in internal data destroys the internal data object" );
jQuery._data(elem, "foo", "foo2"); jQuery._data(elem, "foo", "foo2");
equal( jQuery._data(elem, "foo"), "foo2", "(sanity check) Ensure data is set in internal data object" ); equal( jQuery._data(elem, "foo"), "foo2", "(sanity check) Ensure data is set in internal data object" );
...@@ -121,11 +121,11 @@ function dataTests (elem) { ...@@ -121,11 +121,11 @@ function dataTests (elem) {
if ( elem.nodeType ) { if ( elem.nodeType ) {
oldCacheLength = getCacheLength(); oldCacheLength = getCacheLength();
jQuery.removeData(elem, "foo", true); jQuery._removeData(elem, "foo");
equal( getCacheLength(), oldCacheLength - 1, "Removing the last item in the internal data object also destroys the user data object when it is empty" ); equal( getCacheLength(), oldCacheLength - 1, "Removing the last item in the internal data object also destroys the user data object when it is empty" );
} }
else { else {
jQuery.removeData(elem, "foo", true); jQuery._removeData(elem, "foo");
if (jQuery.support.deleteExpando) { if (jQuery.support.deleteExpando) {
expected = false; expected = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment