X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=dc08a563a95adae9dc0bd99a14b94dd02279aafc;hb=e0b24306a86629f02576017f25d295fbe07f21a5;hp=5404c936c5519e6ffd7162c335a9ece7f528121b;hpb=a44ec402771f6d622506f39073d0be260400dd21;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 5404c93..dc08a56 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,6 +1,8 @@
 (function( jQuery ) {
 
-var windowData = {};
+var windowData = {},
+	rnum = /^-?\d+(?:\.\d+)?(?:E\d+)?$/,
+	rbrace = /^(?:{.*}|\[.*\])$/;
 
 jQuery.extend({
 	cache: {},
@@ -142,8 +144,29 @@ 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] ?