X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=931ea83847225cf1d8e686db418b551bf6474f47;hb=4a46f3d7fbbaa0b7dab49ac815ccec78f1c45d2b;hp=d38d47d3c19114936a79b8b633a53d6b8409f37a;hpb=c4b4df469161ed3c3d372ebed342261efd413ac1;p=jquery.git

diff --git a/src/data.js b/src/data.js
index d38d47d..931ea83 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,4 +1,7 @@
-var windowData = {};
+(function( jQuery ) {
+
+var windowData = {},
+	rnum = /^-?[0-9.]+$/;
 
 jQuery.extend({
 	cache: {},
@@ -140,8 +143,23 @@ 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] ?
@@ -165,3 +183,5 @@ jQuery.fn.extend({
 		});
 	}
 });
+
+})( jQuery );