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

[DE][PE] Fix bug with right panel

Browse source
This commit is contained in:
Julia Radzhabova 2020-11-11 17:46:13 +03:00
parent 7db7e86f83
commit 900ffe6f33
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/main/app/controller/RightMenu.js
View file

@ -53,6 +53,7 @@ define([
initialize: function() { initialize: function() {
this.editMode = true; this.editMode = true;
this._initSettings = true;
this.addListeners({ this.addListeners({
'RightMenu': { 'RightMenu': {
@ -106,10 +107,13 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu); this.rightmenu.fireEvent('editcomplete', this.rightmenu);
}, },
onFocusObject: function(SelectedObjects, open) { onFocusObject: function(SelectedObjects) {
if (!this.editMode) if (!this.editMode)
return; return;
var open = this._initSettings ? !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false;
this._initSettings = false;
var can_add_table = false, var can_add_table = false,
in_equation = false, in_equation = false,
needhide = true; needhide = true;
@ -280,7 +284,7 @@ define([
// this.rightmenu.shapeSettings.createDelayedElements(); // this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements(); var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) { if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu)); this.onFocusObject(selectedElements);
} }
} }
}, },

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

@ -55,6 +55,7 @@ define([
initialize: function() { initialize: function() {
this.editMode = true; this.editMode = true;
this._state = {no_slides: undefined}; this._state = {no_slides: undefined};
this._initSettings = true;
this.addListeners({ this.addListeners({
'RightMenu': { 'RightMenu': {
@ -105,10 +106,13 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu); this.rightmenu.fireEvent('editcomplete', this.rightmenu);
}, },
onFocusObject: function(SelectedObjects, open) { onFocusObject: function(SelectedObjects) {
if (!this.editMode) if (!this.editMode)
return; return;
var open = this._initSettings ? !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false;
this._initSettings = false;
var needhide = true; var needhide = true;
for (var i=0; i<this._settings.length; i++) { for (var i=0; i<this._settings.length; i++) {
if (i==Common.Utils.documentSettingsType.Signature) continue; if (i==Common.Utils.documentSettingsType.Signature) continue;
@ -285,7 +289,7 @@ define([
// this.rightmenu.shapeSettings.createDelayedElements(); // this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements(); var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) { if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu)); this.onFocusObject(selectedElements);
} }
} }
}, },