From 0d42f14dfc345884999505b47ec51c4d075e8141 Mon Sep 17 00:00:00 2001
From: hmuresan <horatiu.muresan@8x8.com>
Date: Fri, 24 Sep 2021 14:56:06 +0300
Subject: [PATCH] chore(interface-config) Group deprecated configs

---
 interface_config.js | 51 +++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/interface_config.js b/interface_config.js
index cbef738fc6..ddcd693c64 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -26,11 +26,6 @@ var interfaceConfig = {
 
     CLOSE_PAGE_GUEST_HINT: false, // A html text to be shown to guests on the close page, false disables it
 
-    // Connection indicators (
-    // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
-    // CONNECTION_INDICATOR_AUTO_HIDE_TIMEOUT,
-    // CONNECTION_INDICATOR_DISABLED) got moved to config.js.
-
     DEFAULT_BACKGROUND: '#474747',
     DEFAULT_LOCAL_DISPLAY_NAME: 'me',
     DEFAULT_LOGO_URL: 'images/watermark.svg',
@@ -39,9 +34,6 @@ var interfaceConfig = {
 
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
 
-    // Deprecated. Please use disableModeratorIndicator from config.js
-    // DISABLE_FOCUS_INDICATOR: false,
-
     /**
      * If true, notifications regarding joining/leaving are no longer displayed.
      */
@@ -97,11 +89,6 @@ var interfaceConfig = {
      */
     HIDE_INVITE_MORE_HEADER: false,
 
-    /**
-     * DEPRECATED! Moved to config.js as `toolbarConfig.initialTimeout`.
-     */
-    // INITIAL_TOOLBAR_TIMEOUT: 20000,
-
     JITSI_WATERMARK_LINK: 'https://jitsi.org',
 
     LANG_DETECTION: true, // Allow i18n to detect the system language
@@ -187,22 +174,6 @@ var interfaceConfig = {
      */
     SUPPORT_URL: 'https://community.jitsi.org/',
 
-    /**
-     * DEPRECATED! Moved to config.js as `toolbarConfig.alwaysVisible`.
-     */
-    // TOOLBAR_ALWAYS_VISIBLE: false,
-
-    /**
-     * DEPRECATED!
-     * This config was moved to config.js as `toolbarButtons`.
-     */
-    // TOOLBAR_BUTTONS: [],
-
-    /**
-     * DEPRECATED! Moved to config.js as `toolbarConfig.timeout`.
-     */
-    // TOOLBAR_TIMEOUT: 4000,
-
     // Browsers, in addition to those which do not fully support WebRTC, that
     // are not supported and should show the unsupported browser page.
     UNSUPPORTED_BROWSERS: [],
@@ -267,6 +238,28 @@ var interfaceConfig = {
      PHONE_NUMBER_REGEX
     */
 
+    // -----------------DEPRECATED CONFIGS BELOW THIS LINE-----------------------------
+
+    // Connection indicators (
+    // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
+    // CONNECTION_INDICATOR_AUTO_HIDE_TIMEOUT,
+    // CONNECTION_INDICATOR_DISABLED) got moved to config.js.
+
+    // Please use disableModeratorIndicator from config.js
+    // DISABLE_FOCUS_INDICATOR: false,
+
+    // Moved to config.js as `toolbarConfig.initialTimeout`.
+    // INITIAL_TOOLBAR_TIMEOUT: 20000,
+
+    // Moved to config.js as `toolbarConfig.alwaysVisible`.
+    // TOOLBAR_ALWAYS_VISIBLE: false,
+
+    // This config was moved to config.js as `toolbarButtons`.
+    // TOOLBAR_BUTTONS: [],
+
+    // Moved to config.js as `toolbarConfig.timeout`.
+    // TOOLBAR_TIMEOUT: 4000,
+
     // Allow all above example options to include a trailing comma and
     // prevent fear when commenting out the last value.
     // eslint-disable-next-line sort-keys