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

diff --git a/src/data.js b/src/data.js
index 120fe71..21b7543 100644
--- a/src/data.js
+++ b/src/data.js
@@ -22,7 +22,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 ) {