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

[DE] debug "FileMenu"

Browse source
This commit is contained in:
Maxim Kadushkin 2017-04-20 13:29:44 +03:00
parent 6e867fb9f0
commit 0875b47bab
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -353,7 +353,7 @@ define([
clickToolbarTab: function (tab, e) { clickToolbarTab: function (tab, e) {
if (tab == 'file') if (tab == 'file')
this.leftMenu.showMenu('file'); else this.leftMenu.showMenu('file'); else
this.leftMenu.close(); this.leftMenu.menuFile.hide();
}, },
/** coauthoring begin **/ /** coauthoring begin **/
@ -577,6 +577,11 @@ define([
return false; return false;
case 'escape': case 'escape':
// if (!this.leftMenu.isOpened()) return true; // if (!this.leftMenu.isOpened()) return true;
if ( this.leftMenu.menuFile.isVisible() ) {
this.leftMenu.menuFile.hide();
return false;
}
var statusbar = DE.getController('Statusbar'); var statusbar = DE.getController('Statusbar');
var menu_opened = statusbar.statusbar.$el.find('.open > [data-toggle="dropdown"]'); var menu_opened = statusbar.statusbar.$el.find('.open > [data-toggle="dropdown"]');
if (menu_opened.length) { if (menu_opened.length) {
@ -590,7 +595,7 @@ define([
return false; return false;
} }
} }
if (this.leftMenu.menuFile.isVisible() || this.leftMenu.btnAbout.pressed || this.leftMenu.btnPlugins.pressed || if (this.leftMenu.btnAbout.pressed || this.leftMenu.btnPlugins.pressed ||
$(e.target).parents('#left-menu').length ) { $(e.target).parents('#left-menu').length ) {
this.leftMenu.close(); this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu'); Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

5
apps/documenteditor/main/app/view/LeftMenu.js
View file

@ -178,10 +178,6 @@ define([
this.supressEvents = true; this.supressEvents = true;
this.btnAbout.toggle(false); this.btnAbout.toggle(false);
if ( this.menuFile.isVisible() ) {
this.menuFile.hide();
}
if (btn.options.action == 'search') { if (btn.options.action == 'search') {
} else { } else {
if (btn.pressed) { if (btn.pressed) {
@ -259,7 +255,6 @@ define([
if ( this.menuFile.isVisible() ) { if ( this.menuFile.isVisible() ) {
this.menuFile.hide(); this.menuFile.hide();
} else { } else {
this.btnAbout.toggle(false); this.btnAbout.toggle(false);
this.$el.width(SCALE_MIN); this.$el.width(SCALE_MIN);
/** coauthoring begin **/ /** coauthoring begin **/