From 713d62f86d2fcdd477af3667006ed1843100e8de Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Mon, 18 Mar 2019 10:08:18 +0700 Subject: [PATCH 1/2] Addresses review comment. --- web/source/text/processor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/source/text/processor.ts b/web/source/text/processor.ts index 02b7708f67..26c1bbace3 100644 --- a/web/source/text/processor.ts +++ b/web/source/text/processor.ts @@ -367,7 +367,7 @@ namespace com.keyman.text { } - if(!fromOSK && !window.event) { + if(!keyman.isEmbedded && !fromOSK && !window.event) { // I1466 - Convert the - keycode on mnemonic as well as positional layouts // FireFox, Mozilla Suite if(keyMapManager.browserMap.FF['k'+keyEvent.Lcode]) { From 7596f539267a27df19dcf4c8ef95b37efe2dc8df Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Mon, 18 Mar 2019 12:11:15 +0700 Subject: [PATCH 2/2] Fixes KMW issues with mouse & key-cap interactions on 'master'. --- web/source/osk/visualKeyboard.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/source/osk/visualKeyboard.ts b/web/source/osk/visualKeyboard.ts index 6207d3a938..1f0fb64a83 100644 --- a/web/source/osk/visualKeyboard.ts +++ b/web/source/osk/visualKeyboard.ts @@ -1593,13 +1593,13 @@ namespace com.keyman.osk { t = t.parentNode; } - let key = getKeyFrom(t); + let key = this.keyTarget(t); if(util.eventType(e) == 'mousedown') { this.currentKey=key.id; util._CancelMouse(e); this.highlightKey(key, true); - } else if(t.id == this.currentKey) { + } else if(key.id == this.currentKey) { this.highlightKey(key, true); } }.bind(this); @@ -1622,13 +1622,13 @@ namespace com.keyman.osk { t = t.parentNode; } - let key = getKeyFrom(t); + let key = this.keyTarget(t); this.highlightKey(key, false); // Process as click if mouse button released anywhere over key if(util.eventType(e) == 'mouseup') { if(key.id == this.currentKey) { - keyman.textProcessor.clickKey(getKeyFrom(key)); + keyman.textProcessor.clickKey(key); } this.currentKey=''; }