X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=295ea794a51d18807e86a4f862e72f16f8bae57e;hb=8ebb9b22df32fe5739a48087b6e33abb9f5cda49;hp=44ad0c49e57ae97f8296bb516df1a8d6b468761a;hpb=e7c2d3b45bf0e8fbe9d7c9316b6c5adb2c019ea3;p=jquery.git diff --git a/src/data.js b/src/data.js index 44ad0c4..295ea79 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 ) {}