X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fdata.js;h=549e73ed4e074dfea6b0963918901d6bd5421f07;hb=e199ead4cba3687beca2444eea4bb8abc20f55b6;hp=c3530c835f731a7d34336c53affa4cb39557832d;hpb=f5d4bf8920868c2d1f88cc4f3bfcf85c0b566b2e;p=jquery.git

diff --git a/src/data.js b/src/data.js
index c3530c8..549e73e 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 ) {