Pull data-* attributes into .data(). Original code by Andrée Hasson and Paul Irish...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index c524a45..f2cfc81 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,4 +1,7 @@
-var windowData = {};
+(function( jQuery ) {
+
+var windowData = {},
+       rnum = /^-?[0-9.]$/;
 
 jQuery.extend({
        cache: {},
@@ -27,7 +30,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,8 +53,9 @@ 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;
                                };
                        }
 
@@ -58,7 +63,7 @@ jQuery.extend({
                        if ( isNode ) {
                                cache[ id ] = {};
                        } else {
-                               var store = {};
+                               store = {};
                                cache[ id ] = function() {
                                        return store;
                                };
@@ -66,7 +71,7 @@ jQuery.extend({
                        
                }
 
-               thisCache = isNode? cache[ id ] : cache[ id ]();
+               thisCache = isNode ? cache[ id ] : cache[ id ]();
 
                // Prevent overriding the named cache with undefined values
                if ( data !== undefined ) {
@@ -138,16 +143,36 @@ 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 ( data != null ) {
+                                               data = data === "true" ? true :
+                                                       data === "false" ? false :
+                                                       data === "null" ? null :
+                                                       rnum.test( data ) ? parseFloat( data ) :
+                                                       data;
+                                       }
+                               }
                        }
+
                        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 );
                        });
                }
        },
@@ -158,3 +183,5 @@ jQuery.fn.extend({
                });
        }
 });
+
+})( jQuery );