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

Merge pull request #100 from ONLYOFFICE/feature/bugfix5.1.3

Browse source 
[PE] Fix Bug 37566
This commit is contained in:
Alexey Golubev 2018-04-24 13:51:31 +03:00 committed by GitHub
parent 2281bc8b12 aa7e09b311
commit 9316472bb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,7 @@ define([
args.forEach(function(sub){
if (sub instanceof Array )
Array.prototype.push.apply(result, sub);
else
else if (sub)
result.push(sub);
});

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1963,7 +1963,7 @@ define([
var toolbar = this.toolbar;
toolbar.$el.find('.toolbar').toggleClass('masked', disable);
this.toolbar.lockToolbar(PE.enumLock.menuFileOpen, disable, {array: toolbar.btnsAddSlide.concat(toolbar.btnChangeSlide, toolbar.btnPreview, toolbar.btnHide)});
this.toolbar.lockToolbar(PE.enumLock.menuFileOpen, disable, {array: toolbar.btnsAddSlide.concat(toolbar.btnChangeSlide, toolbar.btnPreview)});
if(disable) {
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
Common.util.Shortcuts.suspendEvents('command+k, ctrl+k, alt+h, command+f5, ctrl+f5');