diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx index b90dcb7523f0203dd33a970dc328f0326292ebab..b13e6b034f83a1bccb794a534ccdccc4d611895e 100644 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx @@ -303,7 +303,8 @@ class BreakoutRoom extends Component { } blurDurationTime(event) { - this.setState({ durationTime: Number.parseInt(event.target.value, 10) || 1 }); + const value = Number.parseInt(event.target.value, 10); + this.setState({ durationTime: !(value <= 0) ? value : 1 }); } changeNumberOfRooms(event) { diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx index f36b853ee7f2a0ea3e3826ba1f96c4e45a2ba3ad..dffbc2fffe74c82a39464617eca655c52e6207d1 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx @@ -61,7 +61,6 @@ class BreakoutRoom extends Component { this.state = { requestedBreakoutId: '', waiting: false, - generated: false, joinedAudioOnly: false, breakoutId: '', }; @@ -76,18 +75,18 @@ class BreakoutRoom extends Component { const { waiting, - generated, requestedBreakoutId, } = this.state; if (breakoutRooms.length <= 0) closeBreakoutPanel(); - if (waiting && !generated) { + if (waiting) { const breakoutUser = breakoutRoomUser(requestedBreakoutId); if (!breakoutUser) return; if (breakoutUser.redirectToHtml5JoinURL !== '') { - _.delay(() => this.setState({ generated: true, waiting: false }), 1000); + window.open(breakoutUser.redirectToHtml5JoinURL, '_blank'); + _.delay(() => this.setState({ waiting: false }), 1000); } } } @@ -101,15 +100,14 @@ class BreakoutRoom extends Component { { waiting: true, requestedBreakoutId: breakoutId, - generated: false, }, () => requestJoinURL(breakoutId), ); } if (hasUser) { - window.open(hasUser.redirectToHtml5JoinURL); - this.setState({ waiting: false, generated: false }); + window.open(hasUser.redirectToHtml5JoinURL, '_blank'); + this.setState({ waiting: false }); } return null; } @@ -136,7 +134,6 @@ class BreakoutRoom extends Component { const { joinedAudioOnly, breakoutId: stateBreakoutId, - generated, requestedBreakoutId, waiting, } = this.state; @@ -149,12 +146,8 @@ class BreakoutRoom extends Component { return ( <div className={styles.breakoutActions}> <Button - label={generated && requestedBreakoutId === breakoutId - ? intl.formatMessage(intlMessages.generatedURL) - : intl.formatMessage(intlMessages.breakoutJoin)} - aria-label={generated && requestedBreakoutId === breakoutId - ? intl.formatMessage(intlMessages.generatedURL) - : `${intl.formatMessage(intlMessages.breakoutJoin)} ${number}`} + label={intl.formatMessage(intlMessages.breakoutJoin)} + aria-label={`${intl.formatMessage(intlMessages.breakoutJoin)} ${number}`} onClick={() => this.getBreakoutURL(breakoutId)} disabled={disable} className={styles.joinButton}