From c1f69a2f8272355160977cf2c812ac133efed33c Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 18 Aug 2020 17:40:46 +0300
Subject: [PATCH 1/2] [SSE] Fix Bug 46222

---
 apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index e0b4360f4..079dafa95 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1701,7 +1701,7 @@ define([
                             documentHolder.mnuChartEdit.chartInfo = elValue;
                             ischartmenu = true;
                             has_chartprops = true;
-                        }  if ( elValue.asc_getSlicerProperties() ) {
+                        }  else if ( elValue.asc_getSlicerProperties() ) {
                             documentHolder.mnuSlicerAdvanced.imageInfo = elValue;
                             isslicermenu = true;
                         } else {

From 0711da78601f18d4ed0527aa675925ec184f86fb Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 18 Aug 2020 19:02:46 +0300
Subject: [PATCH 2/2] Tab bar refactoring

---
 apps/common/main/lib/component/Mixtbar.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index 72d5e9ed4..946e32b44 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -61,7 +61,7 @@ define([
         };
 
         function onTabDblclick(e) {
-            var tab = $(e.target).data('tab');
+            var tab = $(e.currentTarget).find('> a[data-tab]').data('tab');
             if ( this.dblclick_el == tab )
                 this.fireEvent('change:compact', [tab]);
         }
@@ -235,7 +235,6 @@ define([
 
             onTabClick: function (e) {
                 var me = this;
-
                 var $target = $(e.currentTarget);
                 var tab = $target.find('> a[data-tab]').data('tab');
                 var islone = $target.hasClass('x-lone');
@@ -245,8 +244,12 @@ define([
                         // me.fireEvent('')
                     } else
                     if ( $target.hasClass('active') ) {
-                        me.collapse();
+                        !me._timerSetTab && me.collapse();
                     } else {
+                        me._timerSetTab = true;
+                        setTimeout(function(){
+                            me._timerSetTab = false;
+                        }, 500);
                         me.setTab(tab);
                         me.processPanelVisible(null, true);
                     }