"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "bigbluebutton-html5/imports/startup/client/base.jsx" between
bigbluebutton-2.3.6.tar.gz and bigbluebutton-2.3.7.tar.gz

About: BigBlueButton is a complete web conferencing system (mainly designed for online learning).

base.jsx  (bigbluebutton-2.3.6):base.jsx  (bigbluebutton-2.3.7)
skipping to change at line 229 skipping to change at line 229
renderByState() { renderByState() {
const { updateLoadingState } = this; const { updateLoadingState } = this;
const stateControls = { updateLoadingState }; const stateControls = { updateLoadingState };
const { loading } = this.state; const { loading } = this.state;
const { const {
codeError, codeError,
ejected, ejected,
ejectedReason, ejectedReason,
meetingExist, meetingExist,
meetingHasEnded, meetingHasEnded,
meetingEndedReason,
meetingIsBreakout, meetingIsBreakout,
subscriptionsReady, subscriptionsReady,
User, User,
} = this.props; } = this.props;
if ((loading || !subscriptionsReady) && !meetingHasEnded && meetingExist) { if ((loading || !subscriptionsReady) && !meetingHasEnded && meetingExist) {
return (<LoadingScreen>{loading}</LoadingScreen>); return (<LoadingScreen>{loading}</LoadingScreen>);
} }
if (ejected) { if (ejected) {
return (<MeetingEnded code="403" reason={ejectedReason} />); return (<MeetingEnded code="403" ejectedReason={ejectedReason} />);
} }
if ((meetingHasEnded || User?.loggedOut) && meetingIsBreakout) { if ((meetingHasEnded || User?.loggedOut) && meetingIsBreakout) {
window.close(); window.close();
return null; return null;
} }
if (((meetingHasEnded && !meetingIsBreakout)) || (codeError && User?.loggedO ut)) { if (((meetingHasEnded && !meetingIsBreakout)) || (codeError && User?.loggedO ut)) {
return (<MeetingEnded code={codeError} />); return (<MeetingEnded code={codeError} endedReason={meetingEndedReason} ej ectedReason={ejectedReason} />);
} }
if (codeError && !meetingHasEnded) { if (codeError && !meetingHasEnded) {
// 680 is set for the codeError when the user requests a logout // 680 is set for the codeError when the user requests a logout
if (codeError !== '680') { if (codeError !== '680') {
return (<ErrorScreen code={codeError} />); return (<ErrorScreen code={codeError} />);
} }
return (<MeetingEnded code={codeError} />); return (<MeetingEnded code={codeError} />);
} }
skipping to change at line 320 skipping to change at line 321
loggedOut: 1, loggedOut: 1,
meetingId: 1, meetingId: 1,
userId: 1, userId: 1,
inactivityCheck: 1, inactivityCheck: 1,
responseDelay: 1, responseDelay: 1,
}; };
const User = Users.findOne({ intId: credentials.requesterUserId }, { fields }) ; const User = Users.findOne({ intId: credentials.requesterUserId }, { fields }) ;
const meeting = Meetings.findOne({ meetingId }, { const meeting = Meetings.findOne({ meetingId }, {
fields: { fields: {
meetingEnded: 1, meetingEnded: 1,
meetingEndedReason: 1,
meetingProp: 1, meetingProp: 1,
}, },
}); });
if (meeting && meeting.meetingEnded) { if (meeting && meeting.meetingEnded) {
Session.set('codeError', '410'); Session.set('codeError', '410');
} }
const approved = User?.approved && User?.guest; const approved = User?.approved && User?.guest;
const ejected = User?.ejected; const ejected = User?.ejected;
const ejectedReason = User?.ejectedReason; const ejectedReason = User?.ejectedReason;
const meetingEndedReason = meeting?.meetingEndedReason;
let userSubscriptionHandler; let userSubscriptionHandler;
Breakouts.find({}, { fields: { _id: 1 } }).observeChanges({ Breakouts.find({}, { fields: { _id: 1 } }).observeChanges({
added() { added() {
breakoutNotified = false; breakoutNotified = false;
}, },
removed() { removed() {
// Need to check the number of breakouts left because if a user's role cha nges to viewer // Need to check the number of breakouts left because if a user's role cha nges to viewer
// then all but one room is removed. The data here isn't reactive so no ne ed to filter // then all but one room is removed. The data here isn't reactive so no ne ed to filter
skipping to change at line 428 skipping to change at line 431
ejected, ejected,
ejectedReason, ejectedReason,
userSubscriptionHandler, userSubscriptionHandler,
breakoutRoomSubscriptionHandler, breakoutRoomSubscriptionHandler,
meetingModeratorSubscriptionHandler, meetingModeratorSubscriptionHandler,
animations, animations,
User, User,
isMeteorConnected: Meteor.status().connected, isMeteorConnected: Meteor.status().connected,
meetingExist: !!meeting, meetingExist: !!meeting,
meetingHasEnded: !!meeting && meeting.meetingEnded, meetingHasEnded: !!meeting && meeting.meetingEnded,
meetingEndedReason,
meetingIsBreakout: AppService.meetingIsBreakout(), meetingIsBreakout: AppService.meetingIsBreakout(),
subscriptionsReady: Session.get('subscriptionsReady'), subscriptionsReady: Session.get('subscriptionsReady'),
loggedIn, loggedIn,
codeError, codeError,
usersVideo, usersVideo,
}; };
})(withLayoutContext(Base)); })(withLayoutContext(Base));
export default BaseContainer; export default BaseContainer;
 End of changes. 6 change blocks. 
2 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)