BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve issues with modal on breakouts

Browse Source
This commit is contained in:
Anton Georgiev 2017-05-03 11:06:28 -04:00
parent 1bb56e6581
commit 8d037bc4fa
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { defineMessages, injectIntl } from 'react-intl';
import { withModalMounter } from '/imports/ui/components/modal/service';
import { exitAudio } from '../audio/service';
import AudioService from '../audio/service';
import Modal from '/imports/ui/components/modal/fullscreen/component';
const intlMessages = defineMessages({
@ -45,7 +45,7 @@ class BreakoutJoinConfirmation extends Component {
} = this.props;
// leave main room's audio when joining a breakout room
exitAudio();
AudioService.exitAudio();
window.open(breakoutURL);
mountModal(null);

21
bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
View File

@ -2,7 +2,6 @@ import React, { Component, PropTypes } from 'react';
import _ from 'lodash';
import cx from 'classnames';
import styles from './styles.scss';
import { showModal } from '/imports/ui/components/app/service';
import Button from '../button/component';
import RecordingIndicator from './recording-indicator/component';
import SettingsDropdownContainer from './settings-dropdown/container';
@ -13,6 +12,7 @@ import DropdownTrigger from '/imports/ui/components/dropdown/trigger/component';
import DropdownContent from '/imports/ui/components/dropdown/content/component';
import DropdownList from '/imports/ui/components/dropdown/list/component';
import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
import { withModalMounter } from '/imports/ui/components/modal/service';
import { defineMessages, injectIntl } from 'react-intl';
const intlMessages = defineMessages({
@ -38,10 +38,10 @@ const defaultProps = {
beingRecorded: false,
};
const openBreakoutJoinConfirmation = (breakoutURL, breakoutName) =>
showModal(<BreakoutJoinConfirmation
breakoutURL={breakoutURL}
breakoutName={breakoutName}/>);
const openBreakoutJoinConfirmation = (breakoutURL, breakoutName, mountModal) =>
mountModal(<BreakoutJoinConfirmation
breakoutURL={breakoutURL}
breakoutName={breakoutName}/>);
class NavBar extends Component {
constructor(props) {
@ -64,8 +64,12 @@ class NavBar extends Component {
}
inviteUserToBreakout(breakout, breakoutURL) {
const {
mountModal,
} = this.props;
this.setState({ didSendBreakoutInvite: true }, () => {
openBreakoutJoinConfirmation.call(this, breakoutURL, breakout.name);
openBreakoutJoinConfirmation.call(this, breakoutURL, breakout.name, mountModal);
});
}
@ -164,6 +168,7 @@ class NavBar extends Component {
renderBreakoutItem(breakout) {
const {
getBreakoutJoinURL,
mountModal,
} = this.props;
const breakoutName = breakout.name;
@ -174,7 +179,7 @@ class NavBar extends Component {
className={styles.actionsHeader}
key={_.uniqueId('action-header')}
label={breakoutName}
onClick={openBreakoutJoinConfirmation.bind(this, breakoutURL, breakoutName)}
onClick={openBreakoutJoinConfirmation.bind(this, breakoutURL, breakoutName, mountModal)}
/>
);
}
@ -182,4 +187,4 @@ class NavBar extends Component {
NavBar.propTypes = propTypes;
NavBar.defaultProps = defaultProps;
export default injectIntl(NavBar);
export default withModalMounter(injectIntl(NavBar));