erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-19 06:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixes final minification issues for (at min) native-mode KMW. ADVANCED_OPTIMIZATIONS now possible.

Browse source
This commit is contained in:
Joshua A. Horton 2017-12-22 14:20:37 +07:00
parent d3c05ca378
commit efbd5b39a6
2 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
web/source/keymanweb.ts
View file

@ -2295,16 +2295,16 @@ if(!window['keyman']['initialized']) {
case osk.keyCodes['K_CTRL']: // The 3 shorter "K_*CTRL" entries exist in some legacy keyboards.
case osk.keyCodes['K_LCTRL']:
case osk.keyCodes['K_RCTRL']:
case osk.keyCodes.K_CONTROL:
case osk.keyCodes.K_LCONTROL:
case osk.keyCodes.K_RCONTROL:
case osk.keyCodes['K_CONTROL']:
case osk.keyCodes['K_LCONTROL']:
case osk.keyCodes['K_RCONTROL']:
ctrlEvent = true;
break;
case osk.keyCodes['K_LMENU']: // The 2 "K_*MENU" entries exist in some legacy keyboards.
case osk.keyCodes['K_RMENU']:
case osk.keyCodes.K_ALT:
case osk.keyCodes.K_LALT:
case osk.keyCodes.K_RALT:
case osk.keyCodes['K_ALT']:
case osk.keyCodes['K_LALT']:
case osk.keyCodes['K_RALT']:
altEvent = true;
break;
}
@ -2328,12 +2328,12 @@ if(!window['keyman']['initialized']) {
if(e.ctrlKey) {
curModState |= ((e.location != 0 && ctrlEvent) ?
(e.location == 1 ? osk.modifierCodes.LCTRL : osk.modifierCodes.RCTRL) : // Condition 1
(e.location == 1 ? osk.modifierCodes['LCTRL'] : osk.modifierCodes['RCTRL']) : // Condition 1
prevModState & 0x0003); // Condition 2
}
if(e.altKey) {
curModState |= ((e.location != 0 && altEvent) ?
(e.location == 1 ? osk.modifierCodes.LALT : osk.modifierCodes.RALT) : // Condition 1
(e.location == 1 ? osk.modifierCodes['LALT'] : osk.modifierCodes['RALT']) : // Condition 1
prevModState & 0x000C); // Condition 2
}
@ -2341,21 +2341,21 @@ if(!window['keyman']['initialized']) {
s.Lstates = 0;
if(e.getModifierState("CapsLock")) {
s.Lstates = osk.modifierCodes.CAPS;
s.Lstates = osk.modifierCodes['CAPS'];
} else {
s.Lstates = osk.modifierCodes.NO_CAPS;
s.Lstates = osk.modifierCodes['NO_CAPS'];
}
if(e.getModifierState("NumLock")) {
s.Lstates |= osk.modifierCodes.NUM_LOCK;
s.Lstates |= osk.modifierCodes['NUM_LOCK'];
} else {
s.Lstates |= osk.modifierCodes.NO_NUM_LOCK;
s.Lstates |= osk.modifierCodes['NO_NUM_LOCK'];
}
if(e.getModifierState("ScrollLock") || e.getModifierState("Scroll")) { // "Scroll" for IE9.
s.Lstates |= osk.modifierCodes.SCROLL_LOCK;
s.Lstates |= osk.modifierCodes['SCROLL_LOCK'];
} else {
s.Lstates |= osk.modifierCodes.NO_SCROLL_LOCK;
s.Lstates |= osk.modifierCodes['NO_SCROLL_LOCK'];
}
// We need these states to be tracked as well for proper OSK updates.
@ -2366,14 +2366,14 @@ if(!window['keyman']['initialized']) {
keymanweb.modStateFlags = curModState;
// For European keyboards, not all browsers properly send both key-up events for the AltGr combo.
var altGrMask = osk.modifierCodes.RALT | osk.modifierCodes.LCTRL;
var altGrMask = osk.modifierCodes['RALT'] | osk.modifierCodes['LCTRL'];
if((prevModState & altGrMask) == altGrMask && (curModState & altGrMask) != altGrMask) {
// We just released AltGr - make sure it's all released.
curModState &= ~ altGrMask;
}
// Perform basic filtering for Windows-based ALT_GR emulation on European keyboards.
if(curModState & osk.modifierCodes.RALT) {
curModState &= ~osk.modifierCodes.LCTRL;
if(curModState & osk.modifierCodes['RALT']) {
curModState &= ~osk.modifierCodes['LCTRL'];
}
// Stage 4 - map the modifier set to the appropriate keystroke's modifiers.
@ -2382,16 +2382,16 @@ if(!window['keyman']['initialized']) {
// Note for future - embedding a kill switch here or in keymanweb.osk.emulatesAltGr would facilitate disabling
// AltGr / Right-alt simulation.
if(osk.emulatesAltGr() && (s.Lmodifiers & osk.modifierBitmasks.ALT_GR_SIM) == osk.modifierBitmasks.ALT_GR_SIM) {
s.Lmodifiers ^= osk.modifierBitmasks.ALT_GR_SIM;
s.Lmodifiers |= osk.modifierCodes.RALT;
if(osk.emulatesAltGr() && (s.Lmodifiers & osk.modifierBitmasks['ALT_GR_SIM']) == osk.modifierBitmasks['ALT_GR_SIM']) {
s.Lmodifiers ^= osk.modifierBitmasks['ALT_GR_SIM'];
s.Lmodifiers |= osk.modifierCodes['RALT'];
}
} else {
// No need to sim AltGr here; we don't need chiral ALTs.
s.Lmodifiers =
(e.shiftKey ? 0x10 : 0) |
((curModState & (osk.modifierCodes.LCTRL | osk.modifierCodes.RCTRL)) ? 0x20 : 0) |
((curModState & (osk.modifierCodes.LALT | osk.modifierCodes.RALT)) ? 0x40 : 0);
((curModState & (osk.modifierCodes['LCTRL'] | osk.modifierCodes['RCTRL'])) ? 0x20 : 0) |
((curModState & (osk.modifierCodes['LALT'] | osk.modifierCodes['RALT'])) ? 0x40 : 0);
}
// The 0x6F used to be 0x60 - this adjustment now includes the chiral alt and ctrl modifiers in that check.

24
web/source/kmwosk.ts
View file

@ -1112,25 +1112,25 @@ if(!window['keyman']['initialized']) {
if(m == 0) {
return 'default';
} else {
if(m & osk.modifierCodes.LCTRL) {
if(m & osk.modifierCodes['LCTRL']) {
s = (s.length > 0 ? s + '-' : '') + 'leftctrl';
}
if(m & osk.modifierCodes.RCTRL) {
if(m & osk.modifierCodes['RCTRL']) {
s = (s.length > 0 ? s + '-' : '') + 'rightctrl';
}
if(m & osk.modifierCodes.LALT) {
if(m & osk.modifierCodes['LALT']) {
s = (s.length > 0 ? s + '-' : '') + 'leftalt';
}
if(m & osk.modifierCodes.RALT) {
if(m & osk.modifierCodes['RALT']) {
s = (s.length > 0 ? s + '-' : '') + 'rightalt';
}
if(m & osk.modifierCodes.SHIFT) {
if(m & osk.modifierCodes['SHIFT']) {
s = (s.length > 0 ? s + '-' : '') + 'shift';
}
if(m & osk.modifierCodes.CTRL) {
if(m & osk.modifierCodes['CTRL']) {
s = (s.length > 0 ? s + '-' : '') + 'ctrl';
}
if(m & osk.modifierCodes.ALT) {
if(m & osk.modifierCodes['ALT']) {
s = (s.length > 0 ? s + '-' : '') + 'alt';
}
return s;
@ -1774,9 +1774,9 @@ if(!window['keyman']['initialized']) {
// Are we simulating AltGr? If it's a simulation and not real, time to un-simulate for the OSK.
if(keymanweb.isChiral() && osk.emulatesAltGr() &&
(keymanweb.modStateFlags & osk.modifierBitmasks.ALT_GR_SIM) == osk.modifierBitmasks.ALT_GR_SIM) {
keyShiftState |= osk.modifierBitmasks.ALT_GR_SIM;
keyShiftState &= ~osk.modifierCodes.RALT;
(keymanweb.modStateFlags & osk.modifierBitmasks['ALT_GR_SIM']) == osk.modifierBitmasks['ALT_GR_SIM']) {
keyShiftState |= osk.modifierBitmasks['ALT_GR_SIM'];
keyShiftState &= ~osk.modifierCodes['RALT'];
}
for(i=0; i < lockNames.length; i++) {
@ -2820,7 +2820,7 @@ if(!window['keyman']['initialized']) {
layout=layout||osk.layout;
// Apply an overriding class for 5-row layouts
var nRows=layout.layer[0].row.length;
var nRows=layout['layer'][0]['row'].length;
if(nRows > 4 && util.device.formFactor == 'phone') {
btn.className='kmw-key kmw-5rows kmw-key-'+keyTypes[n];
} else {
@ -2994,7 +2994,7 @@ if(!window['keyman']['initialized']) {
* @return {boolean}
*/
osk.emulatesAltGr = function(keyLabels) {
return !(keyLabels ? keyLabels : osk.layers)[osk.getLayerId(osk.modifierCodes.LCTRL | osk.modifierCodes.LALT)];
return !(keyLabels ? keyLabels : osk.layers)[osk.getLayerId(osk.modifierCodes['LCTRL'] | osk.modifierCodes['LALT'])];
}
/**