diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 59120a311c..8341d9f0cf 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -42,7 +42,7 @@ */ define([ - 'backbone', + 'backbone' ], function (Backbone) { 'use strict'; @@ -169,7 +169,8 @@ define([ }, collapseToolbar: function() { - optsFold.$bar.removeClass('expanded'); + optsFold.$bar && optsFold.$bar.removeClass('expanded'); + Common.UI.Menu.Manager.hideAll(); }, expandToolbar: function() { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index b9beb9d00a..ff7be96587 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -325,6 +325,7 @@ define([ this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this)); this.api.asc_registerCallback('asc_onColumnsProps', _.bind(this.onColumnsProps, this)); this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this)); + this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); }, onChangeCompactView: function(view, compact) { @@ -346,6 +347,10 @@ define([ } }, + onContextMenu: function() { + this.toolbar.collapseToolbar(); + }, + onApiFontSize: function(size) { if (this._state.fontsize !== size) { this.toolbar.cmbFontSize.setValue(size); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 8cebc1e310..c56e72f43d 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -309,6 +309,7 @@ define([ this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this)); this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this)); + this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); this.onSetupCopyStyleButton(); }, @@ -332,6 +333,10 @@ define([ } }, + onContextMenu: function() { + this.toolbar.collapseToolbar(); + }, + onApiFontSize: function(size) { if (this._state.fontsize !== size) { this.toolbar.cmbFontSize.setValue(size);