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

[PE] Bug 55292

Browse source
This commit is contained in:
Julia Radzhabova 2022-02-02 17:46:48 +03:00
parent 4a5ce7f6c4
commit 8117d3532d
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/presentationeditor/main/app/controller/RightMenu.js
View file

@ -56,6 +56,7 @@ define([
this.editMode = true; this.editMode = true;
this._state = {no_slides: undefined}; this._state = {no_slides: undefined};
this._initSettings = true; this._initSettings = true;
this._priorityArr = [];
this.addListeners({ this.addListeners({
'RightMenu': { 'RightMenu': {
@ -95,8 +96,15 @@ define([
this.editMode = mode.isEdit; this.editMode = mode.isEdit;
}, },
onRightMenuClick: function(menu, type, minimized) { onRightMenuClick: function(menu, type, minimized, event) {
if (!minimized && this.editMode) { if (!minimized && this.editMode) {
if (event) { // user click event
var idx = this._priorityArr.indexOf(type);
if (idx>=0)
this._priorityArr.splice(idx, 1);
this._priorityArr.unshift(type);
}
var panel = this._settings[type].panel; var panel = this._settings[type].panel;
var props = this._settings[type].props; var props = this._settings[type].props;
if (props && panel) if (props && panel)
@ -191,6 +199,16 @@ define([
if (!this.rightmenu.minimizedMode || open) { if (!this.rightmenu.minimizedMode || open) {
var active; var active;
if (priorityactive<0 && this._priorityArr.length>0) {
for (i=0; i<this._priorityArr.length; i++) {
var type = this._priorityArr[i],
pnl = this._settings[type];
if (pnl===undefined || pnl.btn===undefined || pnl.panel===undefined || pnl.hidden) continue;
priorityactive = type;
break;
}
}
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
else if (currentactive>=0) active = currentactive; else if (currentactive>=0) active = currentactive;
else if (lastactive>=0) active = lastactive; else if (lastactive>=0) active = lastactive;
@ -249,23 +267,23 @@ define([
}, },
onInsertTable: function() { onInsertTable: function() {
this._settings[Common.Utils.documentSettingsType.Table].needShow = true; // this._settings[Common.Utils.documentSettingsType.Table].needShow = true;
}, },
onInsertImage: function() { onInsertImage: function() {
this._settings[Common.Utils.documentSettingsType.Image].needShow = true; // this._settings[Common.Utils.documentSettingsType.Image].needShow = true;
}, },
onInsertChart: function() { onInsertChart: function() {
this._settings[Common.Utils.documentSettingsType.Chart].needShow = true; // this._settings[Common.Utils.documentSettingsType.Chart].needShow = true;
}, },
onInsertShape: function() { onInsertShape: function() {
this._settings[Common.Utils.documentSettingsType.Shape].needShow = true; // this._settings[Common.Utils.documentSettingsType.Shape].needShow = true;
}, },
onInsertTextArt: function() { onInsertTextArt: function() {
this._settings[Common.Utils.documentSettingsType.TextArt].needShow = true; // this._settings[Common.Utils.documentSettingsType.TextArt].needShow = true;
}, },
UpdateThemeColors: function() { UpdateThemeColors: function() {

2
apps/presentationeditor/main/app/view/RightMenu.js
View file

@ -258,7 +258,7 @@ define([
Common.localStorage.setItem("pe-hide-right-settings", 1); Common.localStorage.setItem("pe-hide-right-settings", 1);
} }
this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode, e]);
}, },
SetActivePane: function(type, open) { SetActivePane: function(type, open) {