Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1315 from ONLYOFFICE/fix/alt-key

Browse source 
Fix/alt key
This commit is contained in:
maxkadushkin 2021-11-15 16:20:16 +03:00 committed by GitHub
parent f6b39aff5a 9e891d4f3d
commit f20b85b0a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/component/HintManager.js
View file

@ -114,7 +114,8 @@ Common.UI.HintManager = new(function() {
_inputLetters = '', _inputLetters = '',
_isComplete = false, _isComplete = false,
_isLockedKeyEvents = false, _isLockedKeyEvents = false,
_inputTimer; _inputTimer,
_isDocReady = false;
var _api; var _api;
@ -370,6 +371,7 @@ Common.UI.HintManager = new(function() {
'app:ready': function (mode) { 'app:ready': function (mode) {
var lang = mode.lang ? mode.lang.toLowerCase() : 'en'; var lang = mode.lang ? mode.lang.toLowerCase() : 'en';
_getAlphabetLetters(lang); _getAlphabetLetters(lang);
_isDocReady = true;
}, },
'hints:clear': _clearHints, 'hints:clear': _clearHints,
'window:resize': _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) { var _getAlphabetLetters = function (lng) {
Common.Utils.loadConfig('../../common/main/resources/alphabetletters/alphabetletters.json', function (langsJson) { Common.Utils.loadConfig('../../common/main/resources/alphabetletters/alphabetletters.json', function (langsJson) {
_arrEnAlphabet = langsJson['en'];
var _setAlphabet = function (lang) { var _setAlphabet = function (lang) {
_lang = lang; _lang = lang;
_arrAlphabet = langsJson[lang]; _arrAlphabet = langsJson[lang];

4
apps/common/main/lib/view/Header.js
View file

@ -476,8 +476,8 @@ define([
iconCls: iconid, iconCls: iconid,
disabled: disabled === true, disabled: disabled === true,
dataHint:'0', dataHint:'0',
dataHintDirection: hintDirection ? hintDirection : 'left', dataHintDirection: hintDirection ? hintDirection : (config.isDesktopApp ? 'right' : 'left'),
dataHintOffset: hintOffset ? hintOffset : '10, 10', dataHintOffset: hintOffset ? hintOffset : (config.isDesktopApp ? '10, -10' : '10, 10'),
dataHintTitle: hintTitle dataHintTitle: hintTitle
})).render(slot); })).render(slot);
} }