Setting the jsonp option to false now inhibits any url manipulation regarding the...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 120fe71..4d1d1bd 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -10,7 +10,8 @@ jQuery.extend({
        uuid: 0,
 
        // Unique for each copy of jQuery on the page
-       expando: "jQuery" + jQuery.now(),
+       // Non-digits removed to match rinlinejQuery
+       expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
 
        // The following elements throw uncatchable exceptions if you
        // attempt to add expando properties to them.
@@ -22,7 +23,11 @@ jQuery.extend({
        },
 
        hasData: function( elem ) {
-               return !elem.nodeType || (elem[ jQuery.expando ] && !jQuery.isEmptyObject(jQuery.cache[ elem[jQuery.expando] ]));
+               if ( elem.nodeType ) {
+                       elem = jQuery.cache[ elem[jQuery.expando] ];
+               }
+
+               return !!elem && !jQuery.isEmptyObject(elem);
        },
 
        data: function( elem, name, data ) {