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

Merge pull request #458 from ONLYOFFICE/fix/bug-46083

Browse source 
[SSE] Fix Bug 46083
This commit is contained in:
Julia Radzhabova 2020-08-11 16:05:56 +03:00 committed by GitHub
parent 5bc9dff559 a173e2d821
commit 42553d4049
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -110,15 +110,23 @@ define([
onRightMenuClick: function(menu, type, minimized, event) { onRightMenuClick: function(menu, type, minimized, event) {
if (!minimized && this.editMode) { if (!minimized && this.editMode) {
if (event) { // user click event if (event) { // user click event
if (type == Common.Utils.documentSettingsType.Table) if (type == Common.Utils.documentSettingsType.Table) {
Common.Utils.InternalSettings.set("sse-rightpanel-active-table", 1); Common.Utils.InternalSettings.set("sse-rightpanel-active-table", 1);
else if (type == Common.Utils.documentSettingsType.Pivot) if (!this._settings[Common.Utils.documentSettingsType.Chart].hidden)
Common.Utils.InternalSettings.set("sse-rightpanel-active-spark", 0);
} else if (type == Common.Utils.documentSettingsType.Pivot)
Common.Utils.InternalSettings.set("sse-rightpanel-active-pivot", 1); Common.Utils.InternalSettings.set("sse-rightpanel-active-pivot", 1);
else if (Common.Utils.documentSettingsType.Cell) { else if (type == Common.Utils.documentSettingsType.Chart && !this._settings[Common.Utils.documentSettingsType.Cell].hidden) {//sparkline
Common.Utils.InternalSettings.set("sse-rightpanel-active-spark", 1);
if (!this._settings[Common.Utils.documentSettingsType.Table].hidden)
Common.Utils.InternalSettings.set("sse-rightpanel-active-table", 0);
} else if (Common.Utils.documentSettingsType.Cell) {
if (!this._settings[Common.Utils.documentSettingsType.Table].hidden) if (!this._settings[Common.Utils.documentSettingsType.Table].hidden)
Common.Utils.InternalSettings.set("sse-rightpanel-active-table", 0); Common.Utils.InternalSettings.set("sse-rightpanel-active-table", 0);
if (!this._settings[Common.Utils.documentSettingsType.Pivot].hidden) if (!this._settings[Common.Utils.documentSettingsType.Pivot].hidden)
Common.Utils.InternalSettings.set("sse-rightpanel-active-pivot", 0); Common.Utils.InternalSettings.set("sse-rightpanel-active-pivot", 0);
if (!this._settings[Common.Utils.documentSettingsType.Chart].hidden)
Common.Utils.InternalSettings.set("sse-rightpanel-active-spark", 0);
} }
} }
@ -259,11 +267,17 @@ define([
var active; var active;
if (priorityactive<0 && !this._settings[Common.Utils.documentSettingsType.Cell].hidden && if (priorityactive<0 && !this._settings[Common.Utils.documentSettingsType.Cell].hidden &&
(!this._settings[Common.Utils.documentSettingsType.Table].hidden || !this._settings[Common.Utils.documentSettingsType.Pivot].hidden)) { (!this._settings[Common.Utils.documentSettingsType.Table].hidden || !this._settings[Common.Utils.documentSettingsType.Pivot].hidden ||
!this._settings[Common.Utils.documentSettingsType.Chart].hidden)) {
var tableactive = !!Common.Utils.InternalSettings.get("sse-rightpanel-active-table") && !this._settings[Common.Utils.documentSettingsType.Table].hidden,
pivotactive = !!Common.Utils.InternalSettings.get("sse-rightpanel-active-pivot") && !this._settings[Common.Utils.documentSettingsType.Pivot].hidden,
sparkactive = !!Common.Utils.InternalSettings.get("sse-rightpanel-active-spark") && !this._settings[Common.Utils.documentSettingsType.Chart].hidden;
if (!this._settings[Common.Utils.documentSettingsType.Table].hidden) if (!this._settings[Common.Utils.documentSettingsType.Table].hidden)
priorityactive = Common.Utils.InternalSettings.get("sse-rightpanel-active-table")==0 ? Common.Utils.documentSettingsType.Cell : Common.Utils.documentSettingsType.Table; priorityactive = !tableactive ? (sparkactive ? Common.Utils.documentSettingsType.Chart : Common.Utils.documentSettingsType.Cell) : Common.Utils.documentSettingsType.Table;
if (!this._settings[Common.Utils.documentSettingsType.Chart].hidden)
priorityactive = !sparkactive ? (tableactive ? Common.Utils.documentSettingsType.Table : Common.Utils.documentSettingsType.Cell) : Common.Utils.documentSettingsType.Chart;
if (!this._settings[Common.Utils.documentSettingsType.Pivot].hidden) if (!this._settings[Common.Utils.documentSettingsType.Pivot].hidden)
priorityactive = Common.Utils.InternalSettings.get("sse-rightpanel-active-pivot")==0 ? Common.Utils.documentSettingsType.Cell : Common.Utils.documentSettingsType.Pivot; priorityactive = !pivotactive ? Common.Utils.documentSettingsType.Cell : Common.Utils.documentSettingsType.Pivot;
} }
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;