Merge branch 'keyboard-nav' of github.com:mmarangoni/bigbluebutton in…

…to merge-3530
bigbluebutton · Jan 9, 2017 · 47c2fef · 47c2fef
2 parents 9b0a707 + 10c4bd2
commit 47c2fef
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/audio-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/audio-menu/component.jsx
@@ -12,7 +12,7 @@ export default class JoinAudioOptions extends React.Component {
           onClick={this.props.close}
           label={'Leave Audio'}
           color={'danger'}
-          icon={'audio'}
+          icon={'mute'}
           size={'lg'}
           circle={true}
         />
@@ -29,7 +29,7 @@ export default class JoinAudioOptions extends React.Component {
         onClick={this.props.open}
         label={'Join Audio'}
         color={'primary'}
-        icon={'audio'}
+        icon={'unmute'}
         size={'lg'}
         circle={true}
       />

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/mute-button/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/mute-button/component.jsx
@@ -7,7 +7,7 @@ export default class MuteAudio extends React.Component {
   render() {
     const { isInAudio, isMuted, callback } = this.props;
     let label = !isMuted ? 'Mute' : 'Unmute';
-    let icon = !isMuted ? 'mute' : 'unmute';
+    let icon = !isMuted ? 'audio-off' : 'audio';
     let className = !isInAudio ? styles.invisible : null;
     let tabIndex = !isInAudio ? -1 : 0;
 

diff --git a/bigbluebutton-html5/imports/ui/components/audio-modal/audio-settings/component.jsx b/bigbluebutton-html5/imports/ui/components/audio-modal/audio-settings/component.jsx
@@ -15,6 +15,7 @@ export default class AudioSettings extends React.Component {
     this.chooseAudio = this.chooseAudio.bind(this);
     this.handleInputChange = this.handleInputChange.bind(this);
     this.handleOutputChange = this.handleOutputChange.bind(this);
+    this.handleClose = this.handleClose.bind(this);
 
     this.state = {
       inputDeviceId: undefined,
@@ -36,6 +37,11 @@ export default class AudioSettings extends React.Component {
     console.log(`OUTPUT DEVICE CHANGED: ${deviceId}`);
   }
 
+  handleClose() {
+    this.setState({ isOpen: false });
+    clearModal();
+  }
+
   render() {
     return (
       <div>
@@ -48,6 +54,14 @@ export default class AudioSettings extends React.Component {
             ghost={true}
             onClick={this.chooseAudio}
           />
+          <Button className={styles.closeBtn}
+            label={'Close'}
+            icon={'close'}
+            size={'lg'}
+            circle={true}
+            hideLabel={true}
+            onClick={this.handleClose}
+          />
           <div>
             Choose your audio settings
           </div>

diff --git a/bigbluebutton-html5/imports/ui/components/audio-modal/join-audio/component.jsx b/bigbluebutton-html5/imports/ui/components/audio-modal/join-audio/component.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import Button from '/imports/ui/components/button/component';
 import { clearModal } from '/imports/ui/components/app/service';
-import classNames from 'classnames';
-import ReactDOM from 'react-dom';
 import styles from '../styles.scss';
 
 export default class JoinAudio extends React.Component {

diff --git a/bigbluebutton-html5/imports/ui/components/audio-modal/listen-only/component.jsx b/bigbluebutton-html5/imports/ui/components/audio-modal/listen-only/component.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import Button from '/imports/ui/components/button/component';
-import classNames from 'classnames';
-import ReactDOM from 'react-dom';
+import { clearModal } from '/imports/ui/components/app/service';
 import styles from '../styles.scss';
 
 import DeviceSelector from '/imports/ui/components/audio/device-selector/component';
@@ -14,6 +13,7 @@ export default class ListenOnly extends React.Component {
 
     this.chooseAudio = this.chooseAudio.bind(this);
     this.handleOutputChange = this.handleOutputChange.bind(this);
+    this.handleClose = this.handleClose.bind(this);
 
     this.state = {
       inputDeviceId: undefined,
@@ -28,6 +28,11 @@ export default class ListenOnly extends React.Component {
     console.log(`OUTPUT DEVICE CHANGED: ${deviceId}`);
   }
 
+  handleClose() {
+    this.setState({ isOpen: false });
+    clearModal();
+  }
+
   render() {
     return (
       <div>
@@ -40,6 +45,14 @@ export default class ListenOnly extends React.Component {
             ghost={true}
             onClick={this.chooseAudio}
           />
+          <Button className={styles.closeBtn}
+            label={'Close'}
+            icon={'close'}
+            size={'lg'}
+            circle={true}
+            hideLabel={true}
+            onClick={this.handleClose}
+          />
           <div>
             Choose your listen only settings
           </div>

diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/list/component.jsx
@@ -71,6 +71,7 @@ export default class DropdownList extends Component {
     }
 
     if ([KEY_CODES.TAB, KEY_CODES.ESCAPE].includes(event.which)) {
+      nextActiveItemIndex = 0;
       dropdownHide();
     }