HTML5 dropdown for settings menu - modify accessibility for each menus

bigbluebutton · Aug 24, 2016 · c04c716 · c04c716
1 parent 8f70d25
commit c04c716
Showing 1 changed file with 12 additions and 24 deletions.
diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx
@@ -151,44 +151,32 @@ export default class SettingsDropdown extends Component {
     this.setState({ focusedMenu: 0 }, () => { this.setFocus(); });
   }
 
-  renderAriaLabelsDescs(i) {
-    switch (i) {
-      case 0:
-        return (
-          <p id="fullScreen" hidden>
-          <FormattedMessage
-            id="app.modals.dropdown.fullScreen"
-            description="Aria label for fullscreen"
-            defaultMessage="Make fullscreen"
-          />
+  renderAriaLabelsDescs() {
+    return (
+      <div>
+        <p id="fullScreen" hidden>
+        <FormattedMessage
+          id="app.modals.dropdown.fullScreen"
+          description="Aria label for fullscreen"
+          defaultMessage="Make fullscreen"
+        />
         </p>
-        );
-        break;
-      case 1:
-        return (
         <p id="settingsModal" hidden>
           <FormattedMessage
             id="app.modals.dropdown.settingsModal"
             description="Aria label for settings"
             defaultMessage="Open Settings"
           />
         </p>
-        );
-        break;
-      case 2:
-        return (
         <p id="leaveSession" hidden>
           <FormattedMessage
             id="app.modals.dropdown.leaveSession"
             description="Aria label for logout"
             defaultMessage="Logout"
           />
         </p>
-        );
-        break;
-      default:
-        return;
-    }
+      </div>
+    );
 
   }
 
@@ -222,10 +210,10 @@ export default class SettingsDropdown extends Component {
 
                     <span className={styles.settingsMenuItemText}>{value.props.title}</span>
                     {index == '0' ? <hr className={styles.hrDropdown}/> : null}
-                    {this.renderAriaLabelsDescs(index)}
                   </li>
                 ))}
               </ul>
+              {this.renderAriaLabelsDescs()}
             </div>
           </DropdownContent>
         </Dropdown>