diff --git a/web/source/kmwapi.ts b/web/source/kmwapi.ts index 9974a5b47c..988bd3fedd 100644 --- a/web/source/kmwapi.ts +++ b/web/source/kmwapi.ts @@ -24,11 +24,6 @@ goog.exportProperty(keyman, "build", keyman); // Only works on individual instances. goog.exportSymbol("KeymanBase.prototype.addEventListener", KeymanBase.prototype.addEventListener); goog.exportSymbol("KeymanBase.prototype.isFontAvailable", KeymanBase.prototype.isFontAvailable); -goog.exportSymbol("KeymanBase.prototype.GetLastActiveElement", KeymanBase.prototype.getLastActiveElement); -goog.exportSymbol("KeymanBase.prototype.FocusLastActiveElement", KeymanBase.prototype.focusLastActiveElement); -goog.exportSymbol("KeymanBase.prototype.HideHelp", KeymanBase.prototype.hideHelp); -goog.exportSymbol("KeymanBase.prototype.ShowHelp", KeymanBase.prototype.showHelp); -goog.exportSymbol("KeymanBase.prototype.ShowPinnedHelp", KeymanBase.prototype.showPinnedHelp); // Util.ts diff --git a/web/source/kmwbase.ts b/web/source/kmwbase.ts index 8e3e39a479..c784f7e107 100644 --- a/web/source/kmwbase.ts +++ b/web/source/kmwbase.ts @@ -349,32 +349,6 @@ class KeymanBase { ['init'](arg) { this.domManager.init(arg); } - - /* - * Legacy entry points (non-standard names)- included only to allow existing IME keyboards to continue to be used - */ - - getLastActiveElement(): HTMLElement { - return this._LastActiveElement; - } - - focusLastActiveElement(): void { - (this)._FocusLastActiveElement(); - } - - //The following entry points are defined but should not normally be used in a keyboard, as OSK display is no longer determined by the keyboard - hideHelp(): void { - this.osk._Hide(true); - } - - showHelp(Px: number, Py: number): void { - this.osk._Show(Px,Py); - } - - showPinnedHelp(): void { - this.osk.userPositioned=true; - this.osk._Show(-1,-1); - } /** * Function _push diff --git a/web/source/kmwcallback.ts b/web/source/kmwcallback.ts index 07946269ee..a0b99082bd 100644 --- a/web/source/kmwcallback.ts +++ b/web/source/kmwcallback.ts @@ -883,4 +883,28 @@ class KeyboardInterface { return this.keymanweb.keyboardManager.activeKeyboard['gs'](element, keystroke); } + /** + * Legacy entry points (non-standard names)- included only to allow existing IME keyboards to continue to be used + */ + ['getLastActiveElement'](): HTMLElement { + return this.keymanweb._LastActiveElement; + } + + ['focusLastActiveElement'](): void { + (this)._FocusLastActiveElement(); + } + + //The following entry points are defined but should not normally be used in a keyboard, as OSK display is no longer determined by the keyboard + ['hideHelp'](): void { + this.keymanweb.osk._Hide(true); + } + + ['showHelp'](Px: number, Py: number): void { + this.keymanweb.osk._Show(Px,Py); + } + + ['showPinnedHelp'](): void { + this.keymanweb.osk.userPositioned=true; + this.keymanweb.osk._Show(-1,-1); + } }