From a9e31a2843fde96ae0347765cebe1f64573e58aa Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Tue, 13 Sep 2016 19:44:47 -0500
Subject: [PATCH] Fixes settings menu for non moderators

---
 .../UI/side_pannels/settings/SettingsMenu.js  | 38 ++++++++++---------
 modules/UI/util/UIUtil.js                     | 21 ++++++++--
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/modules/UI/side_pannels/settings/SettingsMenu.js b/modules/UI/side_pannels/settings/SettingsMenu.js
index 68c7283bd..6e88d62ae 100644
--- a/modules/UI/side_pannels/settings/SettingsMenu.js
+++ b/modules/UI/side_pannels/settings/SettingsMenu.js
@@ -74,11 +74,11 @@ export default {
                     }
                 });
 
-            // Only show the subtitle if this is the only setting section.
+            // Only show the subtitle if this isn't the only setting section.
             if (interfaceConfig.SETTINGS_SECTIONS.length > 1)
-                UIUtil.showHiddenElement("deviceOptionsTitle");
+                UIUtil.showElement("deviceOptionsTitle");
 
-            UIUtil.showHiddenElement("devicesOptions");
+            UIUtil.showElement("devicesOptions");
         }
 
         if (UIUtil.isSettingEnabled('language')) {
@@ -93,7 +93,7 @@ export default {
                 emitter.emit(UIEvents.LANG_CHANGED, languagesBox.val());
             });
 
-            UIUtil.showHiddenElement("languages_selectbox");
+            UIUtil.showElement("languages_selectbox");
         }
 
         if (UIUtil.isSettingEnabled('moderator')) {
@@ -116,13 +116,6 @@ export default {
                     isFollowMeEnabled
                 );
             });
-
-            // Only show the subtitle if this is the only setting section.
-            if (interfaceConfig.SETTINGS_SECTIONS.length > 1)
-                UIUtil.showHiddenElement("moderatorOptionsTitle");
-
-            UIUtil.showHiddenElement("startMutedOptions");
-            UIUtil.showHiddenElement("followMeOptions");
         }
     },
 
@@ -155,10 +148,21 @@ export default {
      * @param {boolean} show
      */
     showStartMutedOptions (show) {
-        if (show) {
-            $("#startMutedOptions").css("display", "block");
+        console.log("------", show, UIUtil.isSettingEnabled('moderator'));
+        if (show && UIUtil.isSettingEnabled('moderator')) {
+            console.log("idva li tuuk");
+            // Only show the subtitle if this isn't the only setting section.
+            if (!$("#moderatorOptionsTitle").is(":visible")
+                && interfaceConfig.SETTINGS_SECTIONS.length > 1)
+                UIUtil.showElement("moderatorOptionsTitle");
+
+            UIUtil.showElement("startMutedOptions");
         } else {
-            $("#startMutedOptions").css("display", "none");
+            // Only show the subtitle if this isn't the only setting section.
+            if ($("#moderatorOptionsTitle").is(":visible"))
+                UIUtil.hideElement("moderatorOptionsTitle");
+
+            UIUtil.hideElement("startMutedOptions");
         }
     },
 
@@ -173,10 +177,10 @@ export default {
      * @param {boolean} show {true} to show those options, {false} to hide them
      */
     showFollowMeOptions (show) {
-        if (show) {
-            $("#followMeOptions").css("display", "block");
+        if (show && UIUtil.isSettingEnabled('moderator')) {
+            UIUtil.showElement("followMeOptions");
         } else {
-            $("#followMeOptions").css("display", "none");
+            UIUtil.hideElement("followMeOptions");
         }
     },
 
diff --git a/modules/UI/util/UIUtil.js b/modules/UI/util/UIUtil.js
index eadd9122c..321de2be9 100644
--- a/modules/UI/util/UIUtil.js
+++ b/modules/UI/util/UIUtil.js
@@ -129,10 +129,25 @@
     /**
      * Shows the element given by id.
      *
-     * @param {String} the identifier of the element
+     * @param {String} the identifier of the element to show
      */
-    showHiddenElement(id) {
-        $("#"+id).toggleClass("hide").toggleClass("show");
+    showElement(id) {
+        if ($("#"+id).hasClass("hide"))
+            $("#"+id).removeClass("hide");
+
+        $("#"+id).addClass("show");
+    },
+
+    /**
+     * Hides the element given by id.
+     *
+     * @param {String} the identifier of the element to hide
+     */
+    hideElement(id) {
+        if ($("#"+id).hasClass("show"))
+            $("#"+id).removeClass("show");
+
+        $("#"+id).addClass("hide");
     },
 
     hideDisabledButtons: function (mappings) {