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

diff --git a/src/data.js b/src/data.js
index 931ea83..abe4689 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,7 +1,8 @@
 (function( jQuery ) {
 
 var windowData = {},
-	rnum = /^-?[0-9.]+$/;
+	rnum = /^-?\d+(?:\.\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;
 					}
 				}
 			}