Ticket #6808. Changes data() so on plain objects, it uses a function to contain the...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 20c134a..6dcfb4c 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,9 +1,13 @@
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
+var windowData = {};
 
 jQuery.extend({
        cache: {},
-       
-       expando:expando,
+
+       // Please use with caution
+       uuid: 0,
+
+       // Unique for each copy of jQuery on the page   
+       expando: "jQuery" + jQuery.now(),
 
        // The following elements throw uncatchable exceptions if you
        // attempt to add expando properties to them.
@@ -22,29 +26,50 @@ jQuery.extend({
                        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 null;
+                       return;
                }
 
+               // Get the data from the object directly
+               if ( !isNode ) {
+                       cache = elem;
+                       id = jQuery.expando;
+
                // Compute a unique ID for the element
-               if ( !id ) { 
-                       id = ++uuid;
+               } else if ( !id ) {
+                       elem[ jQuery.expando ] = id = ++jQuery.uuid;
                }
 
                // 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);
+                       if ( isNode ) {
+                               cache[ id ] = jQuery.extend(true, {}, name);
+                       } else {
+                               cache[ id ] = function() {
+                                       return jQuery.extend(true, {}, name);
+                               }
+                       }
 
                } else if ( !cache[ id ] ) {
-                       elem[ expando ] = id;
-                       cache[ id ] = {};
+                       if ( isNode ) {
+                               cache[ id ] = {};
+                       } else {
+                               var store = {};
+                               cache[ id ] = function() {
+                                       return store;
+                               }
+                       }
+                       
                }
 
                thisCache = cache[ id ];
+               if ( !isNode ) {
+                       thisCache = thisCache();
+               }
 
                // Prevent overriding the named cache with undefined values
                if ( data !== undefined ) {
@@ -63,7 +88,12 @@ jQuery.extend({
                        windowData :
                        elem;
 
-               var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+               var isNode = elem.nodeType,
+                       id = elem[ jQuery.expando ], cache = jQuery.cache;
+               if ( id && !isNode ) {
+                       id = id();
+               }
+               var thisCache = cache[ id ];
 
                // If we want to remove a specific section of the element's data
                if ( name ) {
@@ -79,19 +109,17 @@ jQuery.extend({
 
                // Otherwise, we want to remove all of the element's data
                } else {
-                       // Clean up the element expando
-                       try {
-                               delete elem[ expando ];
-                       } catch( e ) {
-                               // IE has trouble directly removing the expando
-                               // but it's ok with using removeAttribute
-                               if ( elem.removeAttribute ) {
-                                       elem.removeAttribute( expando );
-                               }
+                       if ( jQuery.support.deleteExpando || !isNode ) {
+                               delete elem[ jQuery.expando ];
+
+                       } else if ( elem.removeAttribute ) {
+                               elem.removeAttribute( jQuery.expando );
                        }
 
                        // Completely remove the data cache
-                       delete cache[ id ];
+                       if ( isNode ) {
+                               delete cache[ id ];
+                       }
                }
        }
 });
@@ -122,6 +150,7 @@ jQuery.fn.extend({
                } else {
                        return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
                                jQuery.data( this, key, value );
+                               jQuery.event.trigger( "changeData" + parts[1] + "!", [parts[0], value], this );
                        });
                }
        },
@@ -132,22 +161,3 @@ jQuery.fn.extend({
                });
        }
 });
-
-var removeExpando = function( elem ) {
-       delete elem[ expando ];
-};
-
-try {
-       var div = document.createElement("div");
-       div[ expando ] = true;
-       delete div[ expando ];
-       
-} catch( e ) {
-       // IE has trouble directly removing the expando
-       // but it's ok with using removeAttribute
-       removeExpando = function( elem ) {
-               if ( elem.removeAttribute ) {
-                       elem.removeAttribute( expando );
-               }
-       };
-}
\ No newline at end of file