X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=cf3cf606a96d88fcc97820d68e92b6471352c7d6;hb=3a0a35288304ab5289a1815055623b18de4dc9f6;hp=d38d47d3c19114936a79b8b633a53d6b8409f37a;hpb=c4b4df469161ed3c3d372ebed342261efd413ac1;p=jquery.git diff --git a/src/data.js b/src/data.js index d38d47d..cf3cf60 100644 --- a/src/data.js +++ b/src/data.js @@ -1,4 +1,7 @@ -var windowData = {}; +(function( jQuery ) { + +var windowData = {}, + rbrace = /^(?:\{.*\}|\[.*\])$/; jQuery.extend({ cache: {}, @@ -140,8 +143,29 @@ jQuery.fn.extend({ if ( value === undefined ) { var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + // Try to fetch any internally stored data first if ( data === undefined && this.length ) { data = jQuery.data( this[0], key ); + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && this[0].nodeType === 1 ) { + data = this[0].getAttribute( "data-" + key ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + !isNaN( data ) ? parseFloat( data ) : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + } else { + data = undefined; + } + } } return data === undefined && parts[1] ? @@ -165,3 +189,5 @@ jQuery.fn.extend({ }); } }); + +})( jQuery );