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

[DE][SSE] Show running inside-plugin in the left panel after hiding comment, chat, about panels.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-18 17:08:45 +03:00
parent a394ef749a
commit 3fb4d7abcb
5 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/view/Plugins.js
View file

@ -234,7 +234,7 @@ define([
this.iframePlugin = null; this.iframePlugin = null;
} }
this.currentPluginPanel.toggleClass('hidden', true); this.currentPluginPanel.toggleClass('hidden', true);
this.pluginsPanel.toggleClass('hidden', false); // this.pluginsPanel.toggleClass('hidden', false);
this.fireEvent('plugin:open', [this, 'onboard', 'close']); this.fireEvent('plugin:open', [this, 'onboard', 'close']);
}, },

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

@ -539,6 +539,13 @@ define([
if (this.api) if (this.api)
this.api.asc_enableKeyEvents(value); this.api.asc_enableKeyEvents(value);
if (value) $(this.leftMenu.btnAbout.el).blur(); if (value) $(this.leftMenu.btnAbout.el).blur();
if (value && this.leftMenu._state.pluginIsRunning) {
this.leftMenu.panelPlugins.show();
if (this.mode.canCoAuthoring) {
this.mode.canComments && this.leftMenu.panelComments['hide']();
this.mode.canChat && this.leftMenu.panelChat['hide']();
}
}
}, },
menuFilesShowHide: function(state) { menuFilesShowHide: function(state) {
@ -645,7 +652,9 @@ define([
this.leftMenu.close(); this.leftMenu.close();
this.leftMenu.panelPlugins.show(); this.leftMenu.panelPlugins.show();
this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}}); this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}});
this.leftMenu._state.pluginIsRunning = true;
} else { } else {
this.leftMenu._state.pluginIsRunning = false;
this.leftMenu.close(); this.leftMenu.close();
} }
} }

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

@ -84,6 +84,7 @@ define([
initialize: function () { initialize: function () {
this.minimizedMode = true; this.minimizedMode = true;
this._state = {};
}, },
render: function () { render: function () {
@ -163,7 +164,8 @@ define([
onBtnMenuToggle: function(btn, state) { onBtnMenuToggle: function(btn, state) {
if (state) { if (state) {
btn.panel['show'](); btn.panel['show']();
this.$el.width(SCALE_MIN); if (!this._state.pluginIsRunning)
this.$el.width(SCALE_MIN);
if (this.btnSearch.isActive()) if (this.btnSearch.isActive())
this.btnSearch.toggle(false); this.btnSearch.toggle(false);
@ -190,7 +192,7 @@ define([
if (!(this.$el.width() > SCALE_MIN)) { if (!(this.$el.width() > SCALE_MIN)) {
this.$el.width(parseInt(Common.localStorage.getItem('de-mainmenu-width')) || MENU_SCALE_PART); this.$el.width(parseInt(Common.localStorage.getItem('de-mainmenu-width')) || MENU_SCALE_PART);
} }
} else { } else if (!this._state.pluginIsRunning) {
Common.localStorage.setItem('de-mainmenu-width',this.$el.width()); Common.localStorage.setItem('de-mainmenu-width',this.$el.width());
this.$el.width(SCALE_MIN); this.$el.width(SCALE_MIN);
} }
@ -221,12 +223,12 @@ define([
} }
} }
/** coauthoring end **/ /** coauthoring end **/
if (this.mode.canPlugins && this.panelPlugins) { // if (this.mode.canPlugins && this.panelPlugins) {
if (this.btnPlugins.pressed) { // if (this.btnPlugins.pressed) {
this.panelPlugins.show(); // this.panelPlugins.show();
} else // } else
this.panelPlugins['hide'](); // this.panelPlugins['hide']();
} // }
}, },
setOptionsPanel: function(name, panel) { setOptionsPanel: function(name, panel) {
@ -262,7 +264,8 @@ define([
this.menuFile.hide(); this.menuFile.hide();
} else { } else {
this.btnAbout.toggle(false); this.btnAbout.toggle(false);
this.$el.width(SCALE_MIN); if (!this._state.pluginIsRunning)
this.$el.width(SCALE_MIN);
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.canCoAuthoring) { if (this.mode.canCoAuthoring) {
if (this.mode.canComments) { if (this.mode.canComments) {
@ -277,7 +280,7 @@ define([
} }
} }
/** coauthoring end **/ /** coauthoring end **/
if (this.mode.canPlugins && this.panelPlugins) { if (this.mode.canPlugins && this.panelPlugins && !this._state.pluginIsRunning) {
this.panelPlugins['hide'](); this.panelPlugins['hide']();
this.btnPlugins.toggle(false, true); this.btnPlugins.toggle(false, true);
} }

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

@ -607,6 +607,13 @@ define([
this.api.asc_enableKeyEvents(!state); this.api.asc_enableKeyEvents(!state);
if (!state) $(this.leftMenu.btnAbout.el).blur(); if (!state) $(this.leftMenu.btnAbout.el).blur();
if (!state && this.leftMenu._state.pluginIsRunning) {
this.leftMenu.panelPlugins.show();
if (this.mode.canCoAuthoring) {
this.mode.canComments && this.leftMenu.panelComments['hide']();
this.mode.canChat && this.leftMenu.panelChat['hide']();
}
}
} }
}, },
@ -739,7 +746,9 @@ define([
this.leftMenu.close(); this.leftMenu.close();
this.leftMenu.panelPlugins.show(); this.leftMenu.panelPlugins.show();
this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}}); this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}});
this.leftMenu._state.pluginIsRunning = true;
} else { } else {
this.leftMenu._state.pluginIsRunning = false;
this.leftMenu.close(); this.leftMenu.close();
} }
} }

23
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View file

@ -74,6 +74,7 @@ define([
initialize: function () { initialize: function () {
this.minimizedMode = true; this.minimizedMode = true;
this._state = {};
}, },
render: function () { render: function () {
@ -153,7 +154,8 @@ define([
onBtnMenuToggle: function(btn, state) { onBtnMenuToggle: function(btn, state) {
if (state) { if (state) {
btn.panel['show'](); btn.panel['show']();
this.$el.width(SCALE_MIN); if (!this._state.pluginIsRunning)
this.$el.width(SCALE_MIN);
if (this.btnSearch.isActive()) if (this.btnSearch.isActive())
this.btnSearch.toggle(false); this.btnSearch.toggle(false);
@ -178,7 +180,7 @@ define([
if (!(this.$el.width() > SCALE_MIN)) { if (!(this.$el.width() > SCALE_MIN)) {
this.$el.width(Common.localStorage.getItem('sse-mainmenu-width') || MENU_SCALE_PART); this.$el.width(Common.localStorage.getItem('sse-mainmenu-width') || MENU_SCALE_PART);
} }
} else { } else if (!this._state.pluginIsRunning){
Common.localStorage.setItem('sse-mainmenu-width',this.$el.width()); Common.localStorage.setItem('sse-mainmenu-width',this.$el.width());
this.$el.width(SCALE_MIN); this.$el.width(SCALE_MIN);
} }
@ -208,12 +210,12 @@ define([
this.panelChat['hide'](); this.panelChat['hide']();
} }
} }
if (this.mode.canPlugins && this.panelPlugins) { // if (this.mode.canPlugins && this.panelPlugins) {
if (this.btnPlugins.pressed) { // if (this.btnPlugins.pressed) {
this.panelPlugins.show(); // this.panelPlugins.show();
} else // } else
this.panelPlugins['hide'](); // this.panelPlugins['hide']();
} // }
}, },
setOptionsPanel: function(name, panel) { setOptionsPanel: function(name, panel) {
@ -241,7 +243,8 @@ define([
close: function(menu) { close: function(menu) {
this.btnAbout.toggle(false); this.btnAbout.toggle(false);
this.$el.width(SCALE_MIN); if (!this._state.pluginIsRunning)
this.$el.width(SCALE_MIN);
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.canCoAuthoring) { if (this.mode.canCoAuthoring) {
if (this.mode.canComments) { if (this.mode.canComments) {
@ -256,7 +259,7 @@ define([
} }
} }
/** coauthoring end **/ /** coauthoring end **/
if (this.mode.canPlugins && this.panelPlugins) { if (this.mode.canPlugins && this.panelPlugins && !this._state.pluginIsRunning) {
this.panelPlugins['hide'](); this.panelPlugins['hide']();
this.btnPlugins.toggle(false, true); this.btnPlugins.toggle(false, true);
} }