Make sure that undefined is always returned for undefined data properties. Fixes...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 69adc12..a97ac04 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,5 +1,4 @@
 var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
 
 jQuery.extend({
        cache: {},
@@ -25,9 +24,8 @@ jQuery.extend({
 
                var id = elem[ expando ], cache = jQuery.cache, thisCache;
 
-               // Handle the case where there's no name immediately
-               if ( !name && !id ) {
-                       return null;
+               if ( !id && typeof name === "string" && data === undefined ) {
+                       return;
                }
 
                // Compute a unique ID for the element
@@ -40,17 +38,16 @@ jQuery.extend({
                if ( typeof name === "object" ) {
                        elem[ expando ] = id;
                        thisCache = cache[ id ] = jQuery.extend(true, {}, name);
-               } else if ( cache[ id ] ) {
-                       thisCache = cache[ id ];
-               } else if ( typeof data === "undefined" ) {
-                       thisCache = emptyObject;
-               } else {
-                       thisCache = cache[ id ] = {};
+
+               } else if ( !cache[ id ] ) {
+                       elem[ expando ] = id;
+                       cache[ id ] = {};
                }
 
+               thisCache = cache[ id ];
+
                // Prevent overriding the named cache with undefined values
                if ( data !== undefined ) {
-                       elem[ expando ] = id;
                        thisCache[ name ] = data;
                }
 
@@ -82,15 +79,11 @@ 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 ) {
+                               delete elem[ jQuery.expando ];
+
+                       } else if ( elem.removeAttribute ) {
+                               elem.removeAttribute( jQuery.expando );
                        }
 
                        // Completely remove the data cache
@@ -100,7 +93,7 @@ jQuery.extend({
 });
 
 jQuery.fn.extend({
-       data: function( key, value ){
+       data: function( key, value ) {
                if ( typeof key === "undefined" && this.length ) {
                        return jQuery.data( this[0] );
 
@@ -123,14 +116,14 @@ jQuery.fn.extend({
                                this.data( parts[0] ) :
                                data;
                } else {
-                       return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+                       return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
                                jQuery.data( this, key, value );
                        });
                }
        },
 
-       removeData: function( key ){
-               return this.each(function(){
+       removeData: function( key ) {
+               return this.each(function() {
                        jQuery.removeData( this, key );
                });
        }