X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=cf3cf606a96d88fcc97820d68e92b6471352c7d6;hb=3a0a35288304ab5289a1815055623b18de4dc9f6;hp=44ad0c49e57ae97f8296bb516df1a8d6b468761a;hpb=e7c2d3b45bf0e8fbe9d7c9316b6c5adb2c019ea3;p=jquery.git diff --git a/src/data.js b/src/data.js index 44ad0c4..cf3cf60 100644 --- a/src/data.js +++ b/src/data.js @@ -1,8 +1,7 @@ (function( jQuery ) { var windowData = {}, - rnum = /^-?\d+(?:\.\d+)$/, - rbrace = /^{.*}$/; + rbrace = /^(?:\{.*\}|\[.*\])$/; jQuery.extend({ cache: {}, @@ -158,7 +157,7 @@ jQuery.fn.extend({ data = data === "true" ? true : data === "false" ? false : data === "null" ? null : - rnum.test( data ) ? parseFloat( data ) : + !isNaN( data ) ? parseFloat( data ) : rbrace.test( data ) ? jQuery.parseJSON( data ) : data; } catch( e ) {}