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 6dcfb4c..44ad0c4 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,4 +1,8 @@
-var windowData = {};
+(function( jQuery ) {
+
+var windowData = {},
+       rnum = /^-?\d+(?:\.\d+)$/,
+       rbrace = /^{.*}$/;
 
 jQuery.extend({
        cache: {},
@@ -27,7 +31,8 @@ jQuery.extend({
                        elem;
 
                var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
-                       isNode = elem.nodeType;
+                       isNode = elem.nodeType,
+                       store;
 
                if ( !id && typeof name === "string" && data === undefined ) {
                        return;
@@ -49,27 +54,25 @@ jQuery.extend({
                        if ( isNode ) {
                                cache[ id ] = jQuery.extend(true, {}, name);
                        } else {
+                               store = jQuery.extend(true, {}, name);
                                cache[ id ] = function() {
-                                       return jQuery.extend(true, {}, name);
-                               }
+                                       return store;
+                               };
                        }
 
                } else if ( !cache[ id ] ) {
                        if ( isNode ) {
                                cache[ id ] = {};
                        } else {
-                               var store = {};
+                               store = {};
                                cache[ id ] = function() {
                                        return store;
-                               }
+                               };
                        }
                        
                }
 
-               thisCache = cache[ id ];
-               if ( !isNode ) {
-                       thisCache = thisCache();
-               }
+               thisCache = isNode ? cache[ id ] : cache[ id ]();
 
                // Prevent overriding the named cache with undefined values
                if ( data !== undefined ) {
@@ -141,16 +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 );
-                               jQuery.event.trigger( "changeData" + parts[1] + "!", [parts[0], value], this );
+                               $this.triggerHandler( "changeData" + parts[1] + "!", args );
                        });
                }
        },
@@ -161,3 +190,5 @@ jQuery.fn.extend({
                });
        }
 });
+
+})( jQuery );