X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=4d1d1bd55615ba2944c9cfa9b44dbdd93c307f2d;hb=c43b078c6911027fd4124d542446ad0098662f6a;hp=120fe718dc5aa7a9d371386cac1e28ffe9e1423b;hpb=faefbb1ad0b81e8001b582d06d5bd9c9236e62ce;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 120fe71..4d1d1bd 100644
--- 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 ) {