From 168738fb936d7cde6fa8bf3dd940ecb0d112e93d Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Mon, 19 Aug 2013 20:45:10 +0100 Subject: [PATCH] Return false for mouse handler if propagation is stopped. Refs #1964. --- AppKit/Platform/DOM/CPPlatformWindow+DOM.j | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j index 304cfe7aa..7d0832d4d 100644 --- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j +++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j @@ -1178,8 +1178,12 @@ var resizeTimer = nil; [CPApp sendEvent:event]; } + var didStop = NO; if (StopDOMEventPropagation && (!supportsNativeDragAndDrop || type !== "mousedown" && !isDragging)) + { + didStop = YES; _CPDOMEventStop(aDOMEvent, self); + } // If there are any tracking event listeners (listening for CPLeftMouseDraggedMask) // then show the event guard so we don't lose events to iframes @@ -1201,6 +1205,7 @@ var resizeTimer = nil; _DOMEventGuard.style.display = hasTrackingEventListener ? "" : "none"; [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode]; + return !didStop; } - (void)contextMenuEvent:(DOMEvent)aDOMEvent