Merge speech and assistant settings

Fix WebThingsIO#1213
TizenTeam · Aug 15, 2018 · 27d549d · 27d549d
1 parent 90f95de
commit 27d549d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/static/index.html b/static/index.html
@@ -201,11 +201,6 @@
                    type="checkbox">
             <label for="assistant-experiment-checkbox">Smart Assistant</label>
           </li>
-          <li id="speech-experiment-item" class="experiment-item">
-            <input id="speech-experiment-checkbox" class="experiment-checkbox"
-                   type="checkbox">
-            <label for="speech-experiment-checkbox">Speech Commands</label>
-          </li>
         </ul>
       </section>
       <section id="update-settings" class="hidden settings-section">

diff --git a/static/js/menu.js b/static/js/menu.js
@@ -21,17 +21,18 @@ const Menu = {
     this.element.addEventListener('click', this.handleClick.bind(this));
     this.scrim.addEventListener('click', this.handleScrimClick.bind(this));
     this.items = {};
-    this.items.assistant = document.getElementById('assistant-menu-item');
-    this.items.things = document.getElementById('things-menu-item');
-    this.items.settings = document.getElementById('settings-menu-item');
-    this.items.floorplan = document.getElementById('floorplan-menu-item');
-    this.items.speech = document.getElementById('speech-wrapper');
-    this.items.rules = document.getElementById('rules-menu-item');
-    this.items.rule = document.getElementById('rules-menu-item');
+    this.items.assistant = [
+      document.getElementById('assistant-menu-item'),
+      document.getElementById('speech-wrapper'),
+    ];
+    this.items.things = [document.getElementById('things-menu-item')];
+    this.items.settings = [document.getElementById('settings-menu-item')];
+    this.items.floorplan = [document.getElementById('floorplan-menu-item')];
+    this.items.rules = [document.getElementById('rules-menu-item')];
+    this.items.rule = [document.getElementById('rules-menu-item')];
     this.currentItem = 'things';
 
     this.getExperimentSetting('assistant');
-    this.getExperimentSetting('speech');
   },
 
   /**
@@ -111,23 +112,31 @@ const Menu = {
       console.error(`Tried to select a menu item that didnt exist ${item}`);
       return;
     }
-    this.items[this.currentItem].classList.remove('selected');
-    this.items[item].classList.add('selected');
+    for (const elt of this.items[this.currentItem]) {
+      elt.classList.remove('selected');
+    }
+    for (const elt of this.items[item]) {
+      elt.classList.add('selected');
+    }
     this.currentItem = item;
   },
 
   /**
    * Enable a menu item.
    */
   showItem: function(item) {
-    this.items[item].classList.remove('hidden');
+    for (const elt of this.items[item]) {
+      elt.classList.remove('hidden');
+    }
   },
 
   /*
    * Disable a menu item.
    */
   hideItem: function(item) {
-    this.items[item].classList.add('hidden');
+    for (const elt of this.items[item]) {
+      elt.classList.add('hidden');
+    }
   },
 };
 

diff --git a/static/js/settings.js b/static/js/settings.js
@@ -692,7 +692,6 @@ const SettingsScreen = {
     this.titleName.innerText = 'Experiments';
     this.titleIcon.src = '/optimized-images/experiments-icon.png';
     this.showExperimentCheckbox('assistant', 'assistant-experiment-checkbox');
-    this.showExperimentCheckbox('speech', 'speech-experiment-checkbox');
   },
 
   /**