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

Merge pull request #469 from ONLYOFFICE/fix/bug-44512

Browse source 
Fix/bug 44512
This commit is contained in:
Julia Radzhabova 2020-08-17 18:50:04 +03:00 committed by GitHub
parent 5b1f27950d 33c6978d27
commit 614505780b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/LoadMask.js
View file

@ -149,7 +149,7 @@ define([
timerId = 0; timerId = 0;
} }
if (ownerEl && ownerEl.ismasked) { if (ownerEl && ownerEl.ismasked) {
if (ownerEl.closest('.asc-window.modal').length==0) if (ownerEl.closest('.asc-window.modal').length==0 && !Common.Utils.ModalWindow.isVisible())
Common.util.Shortcuts.resumeEvents(); Common.util.Shortcuts.resumeEvents();
maskeEl && maskeEl.remove(); maskeEl && maskeEl.remove();

4
apps/common/main/lib/component/Window.js
View file

@ -803,7 +803,7 @@ define([
} }
} }
Common.NotificationCenter.trigger('modal:close', this); Common.NotificationCenter.trigger('modal:close', this, hide_mask);
} }
this.$window.remove(); this.$window.remove();
@ -843,7 +843,7 @@ define([
} }
} }
} }
Common.NotificationCenter.trigger('modal:hide', this); Common.NotificationCenter.trigger('modal:hide', this, hide_mask);
} }
this.$window.hide(); this.$window.hide();
this.$window.removeClass('notransform'); this.$window.removeClass('notransform');

8
apps/common/main/lib/util/Shortcuts.js
View file

@ -99,11 +99,11 @@ Common.util = Common.util||{};
'modal:show': function(e){ 'modal:show': function(e){
window.key.suspend(); window.key.suspend();
}, },
'modal:close': function(e) { 'modal:close': function(e, last) {
window.key.resume(); last && window.key.resume();
}, },
'modal:hide': function(e) { 'modal:hide': function(e, last) {
window.key.resume(); last && window.key.resume();
} }
}); });
}, },