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

Merge pull request #6317 from antobinary/timeouts

Browse Source 
Change icon for clearing annotations in whiteboard
This commit is contained in:
Anton Georgiev 2018-11-29 20:40:24 -02:00 committed by GitHub
commit 8a2bbd4c01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
View File

@ -71,7 +71,11 @@ class JoinHandler extends Component {
return resp;
};
const setLogoutURL = (url) => Auth.logoutURL = url;
const setLogoutURL = (url) => {
Auth.logoutURL = url;
return true;
};
const setLogoURL = (resp) => {
setCustomLogoUrl(resp.customLogoURL);
return resp;
@ -97,10 +101,10 @@ class JoinHandler extends Component {
.then((resp) => {
setLogoutURL(resp.logoutURL);
if (resp.returncode !== 'FAILED') {
logger.info(`User successfully went through main.joinRouteHandler with [${resp}].`);
logger.info(`User successfully went through main.joinRouteHandler with [${JSON.stringify(resp)}].`);
return resolve(resp);
}
const e = new Error('Session not found');
const e = new Error('Session not found');
logger.error(`User faced [${e}] on main.joinRouteHandler. Error was:`, JSON.stringify(resp));
return reject(e);
});

2
bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
View File

@ -562,7 +562,7 @@ class WhiteboardToolbar extends Component {
return (
<ToolbarMenuItem
label={intl.formatMessage(intlMessages.toolbarClearAnnotations)}
icon="circle_close"
icon="delete"
onItemClick={this.handleClearAll}
className={cx(styles.toolbarButton, styles.notActive)}
/>