From 594ea6e5cbee4e2882bcbe5a5a95bb4214c11b4e Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Mon, 19 Aug 2013 22:31:02 +0100 Subject: [PATCH] Simplify. --- AppKit/Platform/DOM/CPPlatformPasteboard.j | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/AppKit/Platform/DOM/CPPlatformPasteboard.j b/AppKit/Platform/DOM/CPPlatformPasteboard.j index e6232d66f..014d00d06 100644 --- a/AppKit/Platform/DOM/CPPlatformPasteboard.j +++ b/AppKit/Platform/DOM/CPPlatformPasteboard.j @@ -261,14 +261,15 @@ var hasEditableTarget = function(aDOMEvent) // In both of those cases we don't want to send the event on keydown too, or we'll get 2X copy/cut operations. if (supportsNativeCopyAndPaste || _ignoreNativeCopyOrCutEvent) currentEventShouldBeSuppressed = YES; - - currentEventShouldDefinitelyBubble = YES; } - if (!currentEventShouldBeSuppressed && characters === "v") - SUPPRESS_CAPPUCCINO_PASTE_FOR_EVENT(anEvent); - else if (!currentEventShouldBeSuppressed && characters == "x") - SUPPRESS_CAPPUCCINO_CUT_FOR_EVENT(anEvent); + if (!currentEventShouldBeSuppressed) + { + if (characters === "v") + SUPPRESS_CAPPUCCINO_PASTE_FOR_EVENT(anEvent); + else if (characters === "x") + SUPPRESS_CAPPUCCINO_CUT_FOR_EVENT(anEvent); + } } - (BOOL)windowShouldSuppressKeyEvent