From aa7e09b311f3d7785da808b163e1e4fe479eae47 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 24 Apr 2018 13:46:07 +0300 Subject: [PATCH] [PE] Fix Bug 37566 --- apps/common/main/lib/component/Button.js | 2 +- apps/presentationeditor/main/app/controller/Toolbar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 858e4adde..f5ba8af87 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -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); }); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 39a0e4602..e51c261ad 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -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 = $("
").appendTo(toolbar.$el.find('.toolbar')); Common.util.Shortcuts.suspendEvents('command+k, ctrl+k, alt+h, command+f5, ctrl+f5');