From 2e8bb981a62c2c91e3fa29ad73d64f68f9558b7b Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 1 Oct 2020 22:25:59 +0300
Subject: [PATCH] Refactoring advanced settings

---
 apps/common/main/lib/view/AdvancedSettingsWindow.js  | 12 +++++++-----
 .../main/app/view/TableSettingsAdvanced.js           |  8 +++++++-
 .../main/app/view/ChartSettingsDlg.js                | 12 +++++++++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js
index cf3e6589c..108adb385 100644
--- a/apps/common/main/lib/view/AdvancedSettingsWindow.js
+++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js
@@ -96,7 +96,7 @@ define([
                     allowDepress: false,
                     contentTarget: btnEl.attr('content-target')
                 });
-                btn.on('click', _.bind(me.onCategoryClick, me));
+                btn.on('click', _.bind(me.onCategoryClick, me, btn, index));
                 me.btnsCategory.push(btn);
             });
             var cnt_panel = $window.find('.content-panel'),
@@ -125,7 +125,7 @@ define([
             this.close();
         },
 
-        onCategoryClick: function(btn, event) {
+        onCategoryClick: function(btn, index) {
             this.content_panels.filter('.active').removeClass('active');
             $("#" + btn.options.contentTarget).addClass("active");
         },
@@ -144,19 +144,21 @@ define([
 
         setActiveCategory: function(index) {
             if (this.btnsCategory.length<1) return;
-            
-            var btnActive = this.btnsCategory[(index>=0 && index<this.btnsCategory.length) ? index : 0];
+
+            index = (index>=0 && index<this.btnsCategory.length) ? index : 0;
+            var btnActive = this.btnsCategory[index];
             if (!btnActive.isVisible() || btnActive.isDisabled()) {
                 for (var i = 0; i<this.btnsCategory.length; i++){
                     var btn = this.btnsCategory[i];
                     if (btn.isVisible() && !btn.isDisabled()) {
                         btnActive = btn;
+                        index = i;
                         break;
                     }
                 }
             }
             btnActive.toggle(true);
-            this.onCategoryClick(btnActive);
+            this.onCategoryClick(btnActive, index);
         },
 
         getActiveCategory: function() {
diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
index 581ef0d1c..770309761 100644
--- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
@@ -995,10 +995,16 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             this.CellBackContainer = $('#tableadv-panel-cell-back');
             this.TableBackContainer = $('#tableadv-panel-table-back');
 
-            this.btnsCategory[1].on('click', _.bind(this.onCellCategoryClick, this));
             this.afterRender();
         },
 
+        onCategoryClick: function(btn, index) {
+            Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index);
+
+            if (index==1)
+                this.onCellCategoryClick(btn);
+        },
+
         afterRender: function() {
             this.updateMetricUnit();
             this.updateThemeColors();
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
index bed94f307..3b585a0b6 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
@@ -729,9 +729,6 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                 }
             }, this));
 
-            this.btnsCategory[2].on('click', _.bind(this.onVCategoryClick, this));
-            this.btnsCategory[3].on('click', _.bind(this.onHCategoryClick, this));
-
             // Sparklines
             this.btnSparkType = new Common.UI.Button({
                 cls         : 'btn-large-dataview',
@@ -1000,6 +997,15 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
             }
         },
 
+        onCategoryClick: function(btn, index) {
+            Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index);
+
+            if (index==2)
+                this.onVCategoryClick(btn);
+            else if (index==3)
+                this.onHCategoryClick(btn);
+        },
+
         onSelectType: function(btn, picker, itemView, record) {
             if (this._noApply) return;