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

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