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

Merge pull request #1273 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-10-26 13:39:12 +03:00 committed by GitHub
parent 9917b1ea4f b91210e786
commit ed68ebbd59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/extend/Bootstrap.js
View file

@ -57,7 +57,7 @@ function onDropDownKeyDown(e) {
}
}
} else if ($this.hasClass('move-focus')) {
if (!(/^(27|13|9|32)/.test(e.keyCode) && !e.ctrlKey && !e.altKey)) {
if (!((/^(13|9|32)/.test(e.keyCode) || e.keyCode===27 && !$parent.hasClass('open')) && !e.ctrlKey && !e.altKey)) {
patchDropDownKeyDown.call(this, e);
e.preventDefault();
e.stopPropagation();

4
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -646,6 +646,10 @@ define([
this.submitedTooltip.show();
}
}
if ( type == Asc.c_oAscAsyncActionType.BlockInteraction &&
!((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges'] || id == Asc.c_oAscAsyncAction['DownloadAs']) && Common.Utils.ModalWindow.isVisible()) ) {
this.api.asc_enableKeyEvents(true);
}
},
onDocMouseMoveStart: function() {