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

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

Browse source 
[PE] Fix Bug 37543 (bug in arrays concatenation)
This commit is contained in:
Alexey Golubev 2018-04-23 14:17:35 +03:00 committed by GitHub
parent 29436779d6 a774753614
commit 0755995c28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,11 +164,14 @@ define([
var result = Array.prototype.slice.call(this); var result = Array.prototype.slice.call(this);
args.forEach(function(sub){ args.forEach(function(sub){
Array.prototype.push.apply(result, sub); if (sub instanceof Array )
Array.prototype.push.apply(result, sub);
else
result.push(sub);
}); });
return result; return result;
} };
var _out_array = Object.create(ButtonsArray.prototype); var _out_array = Object.create(ButtonsArray.prototype);
for ( var i in arguments ) { for ( var i in arguments ) {

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

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