Added in support for basic JSON object parsing of data- attributes.

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 0049a9f..44ad0c4 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,9 +1,17 @@
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
+(function( jQuery ) {
+
+var windowData = {},
+       rnum = /^-?\d+(?:\.\d+)$/,
+       rbrace = /^{.*}$/;
 
 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 +30,49 @@ jQuery.extend({
                        windowData :
                        elem;
 
-               var id = elem[ expando ], cache = jQuery.cache, thisCache;
+               var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
+                       isNode = elem.nodeType,
+                       store;
 
                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 {
+                               store = jQuery.extend(true, {}, name);
+                               cache[ id ] = function() {
+                                       return store;
+                               };
+                       }
 
                } else if ( !cache[ id ] ) {
-                       elem[ expando ] = id;
-                       cache[ id ] = {};
+                       if ( isNode ) {
+                               cache[ id ] = {};
+                       } else {
+                               store = {};
+                               cache[ id ] = function() {
+                                       return store;
+                               };
+                       }
+                       
                }
 
-               thisCache = cache[ id ];
+               thisCache = isNode ? cache[ id ] : cache[ id ]();
 
                // Prevent overriding the named cache with undefined values
                if ( data !== undefined ) {
@@ -63,7 +91,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 +112,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 ];
+                       }
                }
        }
 });
@@ -113,15 +144,42 @@ jQuery.fn.extend({
                if ( value === undefined ) {
                        var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
 
+                       // Try to fetch any internally stored data first
                        if ( data === undefined && this.length ) {
                                data = jQuery.data( this[0], key );
+
+                               // If nothing was found internally, try to fetch any
+                               // data from the HTML5 data-* attribute
+                               if ( data === undefined && this[0].nodeType === 1 ) {
+                                       data = this[0].getAttribute( "data-" + key );
+
+                                       if ( typeof data === "string" ) {
+                                               try {
+                                                       data = data === "true" ? true :
+                                                               data === "false" ? false :
+                                                               data === "null" ? null :
+                                                               rnum.test( data ) ? parseFloat( data ) :
+                                                               rbrace.test( data ) ? jQuery.parseJSON( data ) :
+                                                               data;
+                                               } catch( e ) {}
+
+                                       } else {
+                                               data = undefined;
+                                       }
+                               }
                        }
+
                        return data === undefined && parts[1] ?
                                this.data( parts[0] ) :
                                data;
+
                } else {
-                       return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+                       return this.each(function() {
+                               var $this = jQuery( this ), args = [ parts[0], value ];
+
+                               $this.triggerHandler( "setData" + parts[1] + "!", args );
                                jQuery.data( this, key, value );
+                               $this.triggerHandler( "changeData" + parts[1] + "!", args );
                        });
                }
        },
@@ -132,3 +190,5 @@ jQuery.fn.extend({
                });
        }
 });
+
+})( jQuery );