X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=b7a6ab9723c0e91deb1260c435dd986eaee67c79;hb=626624a19a6cbd70b44da08ee2123ba79f8e2bb0;hp=dda1683a52fc2b5d7f0ebb00e38da062c5ccdaab;hpb=ae9df1412c41b1ae676d3808c323b0f01e0b0600;p=jquery.git

diff --git a/src/data.js b/src/data.js
index dda1683..b7a6ab9 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,7 +1,8 @@
 (function( jQuery ) {
 
 var windowData = {},
-	rnum = /^-?\d+(?:\.\d+)$/;
+	rbrace = /^(?:\{.*\}|\[.*\])$/,
+	rdigit = /\d/;
 
 jQuery.extend({
 	cache: {},
@@ -128,8 +129,8 @@ jQuery.extend({
 
 jQuery.fn.extend({
 	data: function( key, value ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
+		if ( typeof key === "undefined" ) {
+			return this.length ? jQuery.data( this[0] ) : null;
 
 		} else if ( typeof key === "object" ) {
 			return this.each(function() {
@@ -153,11 +154,14 @@ jQuery.fn.extend({
 					data = this[0].getAttribute( "data-" + key );
 
 					if ( typeof data === "string" ) {
-						data = data === "true" ? true :
-							data === "false" ? false :
-							data === "null" ? null :
-							rnum.test( data ) ? parseFloat( data ) :
-							data;
+						try {
+							data = data === "true" ? true :
+								data === "false" ? false :
+								data === "null" ? null :
+								rdigit.test( data ) && !isNaN( data ) ? parseFloat( data ) :
+								rbrace.test( data ) ? jQuery.parseJSON( data ) :
+								data;
+						} catch( e ) {}
 
 					} else {
 						data = undefined;