From 84339be3cc2be7da103409fdfba20f370f58c554 Mon Sep 17 00:00:00 2001 From: jahorton Date: Fri, 27 Mar 2020 08:57:09 +0700 Subject: [PATCH] change(web/engine): headlessSpec -> coreSpec --- web/source/dom/preProcessor.ts | 4 ++-- web/source/kmwdevice.ts | 2 +- web/source/kmwembedded.ts | 2 +- web/source/osk/preProcessor.ts | 2 +- web/source/text/engineDeviceSpec.ts | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/source/dom/preProcessor.ts b/web/source/dom/preProcessor.ts index 23b652e00e..681f71341d 100644 --- a/web/source/dom/preProcessor.ts +++ b/web/source/dom/preProcessor.ts @@ -162,7 +162,7 @@ namespace com.keyman.dom { s.LisVirtualKey = LisVirtualKeyCode || e.type != 'keypress'; // Physically-typed keys require use of a 'desktop' form factor and thus are based on a virtual "physical" Device. - s.device = keyman.util.physicalDevice.headlessSpec; + s.device = keyman.util.physicalDevice.coreSpec; // This is based on a KeyboardEvent, so it's not considered 'synthetic' within web-core. s.isSynthetic = false; @@ -188,7 +188,7 @@ namespace com.keyman.dom { vkCode: s.Lcode, // Helps to merge OSK and physical keystroke control paths. Lstates: s.Lstates, kName: '', - device: keyman.util.physicalDevice.headlessSpec, + device: keyman.util.physicalDevice.coreSpec, isSynthetic: false }; } diff --git a/web/source/kmwdevice.ts b/web/source/kmwdevice.ts index b2d1de871f..84dcc19ba5 100644 --- a/web/source/kmwdevice.ts +++ b/web/source/kmwdevice.ts @@ -251,7 +251,7 @@ namespace com.keyman { return this._styles; } - public get headlessSpec(): text.EngineDeviceSpec { + public get coreSpec(): text.EngineDeviceSpec { return new text.EngineDeviceSpec(this.browser, this.formFactor, this.OS, this.touchable); } } diff --git a/web/source/kmwembedded.ts b/web/source/kmwembedded.ts index 6f63da9233..e526eebea4 100644 --- a/web/source/kmwembedded.ts +++ b/web/source/kmwembedded.ts @@ -480,7 +480,7 @@ namespace com.keyman.text { Lstates: lstates, LisVirtualKey: true, kName: '', - device: keyman.util.physicalDevice.headlessSpec, // As we're executing a hardware keystroke. + device: keyman.util.physicalDevice.coreSpec, // As we're executing a hardware keystroke. isSynthetic: false }; diff --git a/web/source/osk/preProcessor.ts b/web/source/osk/preProcessor.ts index 444e50e109..dda391da4e 100644 --- a/web/source/osk/preProcessor.ts +++ b/web/source/osk/preProcessor.ts @@ -28,7 +28,7 @@ namespace com.keyman.osk { kLayer: layer, kbdLayer: e.displayLayer, kNextLayer: e.nextlayer, - device: keyman.util.device.headlessSpec, // The OSK's events always use the 'true' device. + device: keyman.util.device.coreSpec, // The OSK's events always use the 'true' device. isSynthetic: true }; diff --git a/web/source/text/engineDeviceSpec.ts b/web/source/text/engineDeviceSpec.ts index 15f96be720..6ce11b77dd 100644 --- a/web/source/text/engineDeviceSpec.ts +++ b/web/source/text/engineDeviceSpec.ts @@ -25,8 +25,9 @@ namespace com.keyman.text { } /** - * This class provides an abstract version of com.keyman.Device that is headless-friendly, - * containing only the information needed by web-core for text processing use. + * This class provides an abstract version of com.keyman.Device that is core-friendly, + * containing only the information needed by web-core for text processing use, devoid + * of any direct references to the DOM. */ export class EngineDeviceSpec { readonly browser: Browser;