diff --git a/interface/resources/html/raiseAndLowerKeyboard.js b/interface/resources/html/raiseAndLowerKeyboard.js index 23f3a7e9a8..a0aa1eb7fe 100644 --- a/interface/resources/html/raiseAndLowerKeyboard.js +++ b/interface/resources/html/raiseAndLowerKeyboard.js @@ -12,9 +12,9 @@ var MAX_WARNINGS = 3; var numWarnings = 0; var isWindowFocused = true; - var isKeyboardRaised = false; - var isNumericKeyboard = false; - var isPasswordField = false; + window.isKeyboardRaised = false; + window.isNumericKeyboard = false; + window.isPasswordField = false; function shouldSetPasswordField() { var nodeType = document.activeElement.type; @@ -62,7 +62,7 @@ var passwordField = shouldSetPasswordField(); if (isWindowFocused && - (keyboardRaised !== isKeyboardRaised || numericKeyboard !== isNumericKeyboard || passwordField !== isPasswordField)) { + (keyboardRaised !== window.isKeyboardRaised || numericKeyboard !== window.isNumericKeyboard || passwordField !== window.isPasswordField)) { if (typeof EventBridge !== "undefined" && EventBridge !== null) { EventBridge.emitWebEvent( @@ -75,20 +75,20 @@ } } - if (!isKeyboardRaised) { + if (!window.isKeyboardRaised) { scheduleBringToView(250); // Allow time for keyboard to be raised in QML. // 2DO: should it be rather done from 'client area height changed' event? } - isKeyboardRaised = keyboardRaised; - isNumericKeyboard = numericKeyboard; - isPasswordField = passwordField; + window.isKeyboardRaised = keyboardRaised; + window.isNumericKeyboard = numericKeyboard; + window.isPasswordField = passwordField; } }, POLL_FREQUENCY); window.addEventListener("click", function () { var keyboardRaised = shouldRaiseKeyboard(); - if(keyboardRaised && isKeyboardRaised) { + if (keyboardRaised && window.isKeyboardRaised) { scheduleBringToView(150); } }); @@ -99,7 +99,7 @@ window.addEventListener("blur", function () { isWindowFocused = false; - isKeyboardRaised = false; - isNumericKeyboard = false; + window.isKeyboardRaised = false; + window.isNumericKeyboard = false; }); })(); diff --git a/scripts/system/html/js/keyboardControl.js b/scripts/system/html/js/keyboardControl.js index f2937bc63a..7a8a314c62 100644 --- a/scripts/system/html/js/keyboardControl.js +++ b/scripts/system/html/js/keyboardControl.js @@ -15,6 +15,9 @@ function setUpKeyboardControl() { var KEYBOARD_HEIGHT = 200; function raiseKeyboard() { + window.isKeyboardRaised = true; + window.isNumericKeyboard = this.type === "number"; + if (lowerTimer !== null) { clearTimeout(lowerTimer); lowerTimer = null; @@ -35,6 +38,9 @@ function setUpKeyboardControl() { } function doLowerKeyboard() { + window.isKeyboardRaised = false; + window.isNumericKeyboard = false; + EventBridge.emitWebEvent("_LOWER_KEYBOARD"); lowerTimer = null; isRaised = false;