Revert portions of 7acb141ed7f2dedd950bb65acf878098640d081e that attempt to use a...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index a1abc9e..9fee459 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -68,7 +68,7 @@ jQuery.extend({
 
                // An object can be passed to jQuery.data instead of a key/value pair; this gets
                // shallow copied over onto the existing cache
-               if ( typeof name === "object" ) {
+               if ( typeof name === "object" || typeof name === "function" ) {
                        if ( pvt ) {
                                cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
                        } else {
@@ -93,6 +93,13 @@ jQuery.extend({
                        thisCache[ name ] = data;
                }
 
+               // TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
+               // not attempt to inspect the internal events object using jQuery.data, as this
+               // internal data object is undocumented and subject to change.
+               if ( name === "events" && !thisCache[name] ) {
+                       return thisCache[ internalKey ] && thisCache[ internalKey ].events;
+               }
+
                return getByName ? thisCache[ name ] : thisCache;
        },