diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 89af9cccb..61241e5d8 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -788,7 +788,7 @@ define([ allowMerge: false, allowSignature: false, allowProtect: false, - rightMenu: {clear: true, disable: true}, + rightMenu: {clear: disable, disable: true}, statusBar: true, leftMenu: {disable: false, previewMode: true}, fileMenu: {protect: true}, diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index b353a076a..94334cbd8 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -306,7 +306,7 @@ define([ allowMerge: false, allowSignature: false, allowProtect: false, - rightMenu: {clear: true, disable: true}, + rightMenu: {clear: disable, disable: true}, statusBar: true, leftMenu: {disable: false, previewMode: true}, fileMenu: false, diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index c360de65b..ee9c25be2 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -135,11 +135,11 @@ define([ this.onFocusObject(SelectedObjects); }, - onFocusObject: function(SelectedObjects, forceSignature) { + onFocusObject: function(SelectedObjects, forceSignature, forceOpen) { if (!this.editMode && !forceSignature) return; - var open = this._initSettings ? !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false; + var open = this._initSettings ? !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu) : !!forceOpen; this._initSettings = false; var can_add_table = false, @@ -447,7 +447,7 @@ define([ } else { var selectedElements = this.api.getSelectedElements(); if (selectedElements.length > 0) - this.onFocusObject(selectedElements); + this.onFocusObject(selectedElements, false, !Common.Utils.InternalSettings.get("de-hide-right-settings")); } } }, diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index 9192a239b..cd06779b9 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -151,6 +151,7 @@ define([ this.defaultHideRightMenu = mode.customization && !!mode.customization.hideRightMenu; var open = !Common.localStorage.getBool("de-hide-right-settings", this.defaultHideRightMenu); + Common.Utils.InternalSettings.set("de-hide-right-settings", !open); this.$el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px'); this.$el.show(); @@ -279,6 +280,7 @@ define([ target_pane_parent.css("display", "inline-block" ); this.minimizedMode = false; Common.localStorage.setItem("de-hide-right-settings", 0); + Common.Utils.InternalSettings.set("de-hide-right-settings", false); } target_pane_parent.find('> .active').removeClass('active'); target_pane.addClass("active"); @@ -291,6 +293,7 @@ define([ $(this.el).width(SCALE_MIN); this.minimizedMode = true; Common.localStorage.setItem("de-hide-right-settings", 1); + Common.Utils.InternalSettings.set("de-hide-right-settings", true); } this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode, e]);