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

[DE][PE] Close toolbar menus when toolbar is collapsed. Collapse toolbar when document context menu is opened.

Browse source
This commit is contained in:
Julia Radzhabova 2017-04-24 17:35:00 +03:00
parent d503fd94fc
commit 293d08c2be
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/component/Mixtbar.js
View file

@ -42,7 +42,7 @@
*/ */
define([ define([
'backbone', 'backbone'
], function (Backbone) { ], function (Backbone) {
'use strict'; 'use strict';
@ -169,7 +169,8 @@ define([
}, },
collapseToolbar: function() { collapseToolbar: function() {
optsFold.$bar.removeClass('expanded'); optsFold.$bar && optsFold.$bar.removeClass('expanded');
Common.UI.Menu.Manager.hideAll();
}, },
expandToolbar: function() { expandToolbar: function() {

5
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -325,6 +325,7 @@ define([
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this)); 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_onColumnsProps', _.bind(this.onColumnsProps, this));
this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, 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) { onChangeCompactView: function(view, compact) {
@ -346,6 +347,10 @@ define([
} }
}, },
onContextMenu: function() {
this.toolbar.collapseToolbar();
},
onApiFontSize: function(size) { onApiFontSize: function(size) {
if (this._state.fontsize !== size) { if (this._state.fontsize !== size) {
this.toolbar.cmbFontSize.setValue(size); this.toolbar.cmbFontSize.setValue(size);

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

@ -309,6 +309,7 @@ define([
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this)); 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_onMathTypes', _.bind(this.onMathTypes, this));
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
this.onSetupCopyStyleButton(); this.onSetupCopyStyleButton();
}, },
@ -332,6 +333,10 @@ define([
} }
}, },
onContextMenu: function() {
this.toolbar.collapseToolbar();
},
onApiFontSize: function(size) { onApiFontSize: function(size) {
if (this._state.fontsize !== size) { if (this._state.fontsize !== size) {
this.toolbar.cmbFontSize.setValue(size); this.toolbar.cmbFontSize.setValue(size);