From a05d2d9abadccbebe56afbfbdb3d2f0e109424d6 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 15 Nov 2021 15:47:39 +0300 Subject: [PATCH 1/2] [DE PE SSE] Fix bug 53716 --- apps/common/main/lib/component/HintManager.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index 0ff9b77be..3843c4416 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -114,7 +114,8 @@ Common.UI.HintManager = new(function() { _inputLetters = '', _isComplete = false, _isLockedKeyEvents = false, - _inputTimer; + _inputTimer, + _isDocReady = false; var _api; @@ -370,6 +371,7 @@ Common.UI.HintManager = new(function() { 'app:ready': function (mode) { var lang = mode.lang ? mode.lang.toLowerCase() : 'en'; _getAlphabetLetters(lang); + _isDocReady = true; }, 'hints:clear': _clearHints, 'window:resize': _clearHints @@ -490,12 +492,13 @@ Common.UI.HintManager = new(function() { } } - _needShow = (e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible()); + _needShow = (e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady); }); }; var _getAlphabetLetters = function (lng) { Common.Utils.loadConfig('../../common/main/resources/alphabetletters/alphabetletters.json', function (langsJson) { + _arrEnAlphabet = langsJson['en']; var _setAlphabet = function (lang) { _lang = lang; _arrAlphabet = langsJson[lang]; From 9e891d4f3d9bcf882054730ebc88593eaa3eae6e Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 15 Nov 2021 15:49:01 +0300 Subject: [PATCH 2/2] [DE PE SSE] Fix alt hint's position for desktop app --- apps/common/main/lib/view/Header.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index d14a04d90..aa5b76264 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -476,8 +476,8 @@ define([ iconCls: iconid, disabled: disabled === true, dataHint:'0', - dataHintDirection: hintDirection ? hintDirection : 'left', - dataHintOffset: hintOffset ? hintOffset : '10, 10', + dataHintDirection: hintDirection ? hintDirection : (config.isDesktopApp ? 'right' : 'left'), + dataHintOffset: hintOffset ? hintOffset : (config.isDesktopApp ? '10, -10' : '10, 10'), dataHintTitle: hintTitle })).render(slot); }