From a7e603ca5f028f286ab29da088544be95a5e605e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 18 Oct 2016 11:58:27 +0300
Subject: [PATCH] [PE] [SSE] Optimization of right panel.

---
 apps/presentationeditor/main/app/controller/RightMenu.js | 7 ++++---
 apps/presentationeditor/main/app/view/RightMenu.js       | 2 +-
 apps/spreadsheeteditor/main/app/controller/RightMenu.js  | 7 ++++---
 apps/spreadsheeteditor/main/app/view/RightMenu.js        | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js
index cc4919e67..f26d27389 100644
--- a/apps/presentationeditor/main/app/controller/RightMenu.js
+++ b/apps/presentationeditor/main/app/controller/RightMenu.js
@@ -148,14 +148,15 @@ define([
                 }
             }
 
-            var lastactive = -1, currentactive, priorityactive = -1;
+            var lastactive = -1, currentactive, priorityactive = -1,
+                activePane = this.rightmenu.GetActivePane();
             for (i=0; i<this._settings.length; i++) {
                 var pnl = this._settings[i];
                 if (pnl===undefined) continue;
 
                 if ( pnl.hidden ) {
                     if (!pnl.btn.isDisabled()) pnl.btn.setDisabled(true);
-                    if (this.rightmenu.GetActivePane() == pnl.panelId)
+                    if (activePane == pnl.panelId)
                         currentactive = -1;
                 } else {
                     if (pnl.btn.isDisabled()) pnl.btn.setDisabled(false);
@@ -165,7 +166,7 @@ define([
                         pnl.needShow = false;
                         priorityactive = i;
                     } else if ( i != Common.Utils.documentSettingsType.Slide || this.rightmenu._settings[i].isCurrent) {
-                        if (this.rightmenu.GetActivePane() == pnl.panelId)
+                        if (activePane == pnl.panelId)
                             currentactive = i;
                     }
 
diff --git a/apps/presentationeditor/main/app/view/RightMenu.js b/apps/presentationeditor/main/app/view/RightMenu.js
index 5f78ff9c7..8f06a91e7 100644
--- a/apps/presentationeditor/main/app/view/RightMenu.js
+++ b/apps/presentationeditor/main/app/view/RightMenu.js
@@ -254,7 +254,7 @@ define([
         },
 
         GetActivePane: function() {
-            return (this.minimizedMode) ? null : $(".settings-panel.active")[0].id;
+            return (this.minimizedMode) ? null : this.$el.find(".settings-panel.active")[0].id;
         },
 
         SetDisabled: function(id, disabled, all) {
diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
index f318d6127..efb89dbf7 100644
--- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
@@ -177,7 +177,8 @@ define([
                 this._settings[settingsType].hidden = 0;
             }
             
-            var lastactive = -1, currentactive, priorityactive = -1;
+            var lastactive = -1, currentactive, priorityactive = -1,
+                activePane = this.rightmenu.GetActivePane();
             for (i=0; i<this._settings.length; ++i) {
                 var pnl = this._settings[i];
                 if (pnl===undefined) continue;
@@ -185,7 +186,7 @@ define([
                 if ( pnl.hidden ) {
                     if ( !pnl.btn.isDisabled() )
                         pnl.btn.setDisabled(true);
-                    if (this.rightmenu.GetActivePane() == pnl.panelId)
+                    if (activePane == pnl.panelId)
                         currentactive = -1;
                 } else {
                     if ( pnl.btn.isDisabled() )
@@ -194,7 +195,7 @@ define([
                     if ( pnl.needShow ) {
                         pnl.needShow = false;
                         priorityactive = i;
-                    } else if (this.rightmenu.GetActivePane() == pnl.panelId)
+                    } else if (activePane == pnl.panelId)
                         currentactive = i;
                     pnl.panel.setLocked(pnl.locked);
                 }
diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js
index 1bd466574..fa658baf3 100644
--- a/apps/spreadsheeteditor/main/app/view/RightMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js
@@ -234,7 +234,7 @@ define([
         },
 
         GetActivePane: function() {
-            return (this.minimizedMode) ? null : $(".settings-panel.active")[0].id;
+            return (this.minimizedMode) ? null : this.$el.find(".settings-panel.active")[0].id;
         },
 
         clearSelection: function() {