X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=2620646da0615f16195a867b16a10bb6da8b8e3b;hb=2ac4067a639856a6035c3bd00aab132c9714b52d;hp=1bfb4bbcfb0026d22f1afdc6fdabd029391b49f1;hpb=752db8fffeffa796f5cdb5553331436c0a4cc44e;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 1bfb4bb..2620646 100644
--- a/src/event.js
+++ b/src/event.js
@@ -661,7 +661,7 @@ var withinElement = function( event ) {
 
 		// Chrome does something similar, the parentNode property
 		// can be accessed but is null.
-		if ( parent !== document && !parent.parentNode ) {
+		if ( parent && parent !== document && !parent.parentNode ) {
 			return;
 		}
 		// Traverse up the tree
@@ -1099,7 +1099,7 @@ function liveHandler( event ) {
 		for ( j = 0; j < live.length; j++ ) {
 			handleObj = live[j];
 
-			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) {
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
 				elem = close.elem;
 				related = null;