From 5e35c8dda6dff90cc5cb752ddda06b2923c81716 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Wed, 22 Jun 2022 08:18:13 +0100 Subject: [PATCH] Revert "Allow global keyboard shortcuts to work in framed editor (#6705)" This reverts commit 8e64e21039d9e8a76704e85a5c80f23495fd61e4. See https://github.com/Jermolene/TiddlyWiki5/pull/6705#issuecomment-1162738927 --- core/modules/editor/engines/framed.js | 3 --- core/modules/utils/dom/dom.js | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js index 610bda5dc..957a9156e 100644 --- a/core/modules/editor/engines/framed.js +++ b/core/modules/editor/engines/framed.js @@ -84,9 +84,6 @@ function FramedEngine(options) { // Copy the styles from the dummy textarea this.copyStyles(); // Add event listeners - $tw.utils.addEventListeners(this.iframeDoc, [ - {name: "keydown",handlerObject: $tw.keyboardManager,handlerMethod: "handleKeydownEvent", capture: true}, - ]); $tw.utils.addEventListeners(this.domNode,[ {name: "click",handlerObject: this,handlerMethod: "handleClickEvent"}, {name: "input",handlerObject: this,handlerMethod: "handleInputEvent"}, diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js index b18f26e00..330d184cc 100644 --- a/core/modules/utils/dom/dom.js +++ b/core/modules/utils/dom/dom.js @@ -198,7 +198,6 @@ Each entry in the events array is an object with these properties: handlerFunction: optional event handler function handlerObject: optional event handler object handlerMethod: optionally specifies object handler method name (defaults to `handleEvent`) -capture: optionally specifies the listener should use capture (defaults to `false`) */ exports.addEventListeners = function(domNode,events) { $tw.utils.each(events,function(eventInfo) { @@ -214,7 +213,7 @@ exports.addEventListeners = function(domNode,events) { handler = eventInfo.handlerObject; } } - domNode.addEventListener(eventInfo.name,handler,!!eventInfo.capture); + domNode.addEventListener(eventInfo.name,handler,false); }); };