Make sure the data- number has at least one number in it before passing to isNaN...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index f2cfc81..3bd4b97 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var windowData = {},
-       rnum = /^-?[0-9.]$/;
+       rbrace = /^(?:\{.*\}|\[.*\])$/;
 
 jQuery.extend({
        cache: {},
@@ -152,12 +152,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 :
+                                                               /\d/.test( data ) && !isNaN( data ) ? parseFloat( data ) :
+                                                               rbrace.test( data ) ? jQuery.parseJSON( data ) :
+                                                               data;
+                                               } catch( e ) {}
+
+                                       } else {
+                                               data = undefined;
                                        }
                                }
                        }