erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-11 18:17:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into web-predict-request-gen

Browse source
This commit is contained in:
Joshua A. Horton 2019-03-19 08:27:47 +07:00
commit 96ce41bf65
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/source/osk/visualKeyboard.ts
View file

@ -1593,13 +1593,13 @@ namespace com.keyman.osk {
t = <HTMLElement> 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 = <HTMLElement> 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='';
}

2
web/source/text/processor.ts
View file

@ -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]) {