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