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