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

Merge pull request #7982 from capilkey/fix-wb-toolbar

Browse Source 
Make sure the whiteboard toolbar exists first before animating
This commit is contained in:
Anton Georgiev 2019-08-23 17:22:49 -04:00 committed by GitHub
commit 3917a8206e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,21 +282,23 @@ class WhiteboardToolbar extends Component {
* 4. Trigger initial animation for the icons
*/
// 1st case
if (colorSelected.value !== prevState.colorSelected.value) {
// 1st case b)
if (annotationSelected.value !== 'text') {
if (this.thicknessListIconRadius && this.thicknessListIconColor) {
if (colorSelected.value !== prevState.colorSelected.value) {
// 1st case b)
if (annotationSelected.value !== 'text') {
this.thicknessListIconColor.beginElement();
}
// 1st case a)
this.colorListIconColor.beginElement();
// 2nd case
} else if (thicknessSelected.value !== prevState.thicknessSelected.value) {
this.thicknessListIconRadius.beginElement();
// 3rd case
} else if (annotationSelected.value !== 'text'
&& prevState.annotationSelected.value === 'text') {
this.thicknessListIconRadius.beginElement();
this.thicknessListIconColor.beginElement();
}
// 1st case a)
this.colorListIconColor.beginElement();
// 2nd case
} else if (thicknessSelected.value !== prevState.thicknessSelected.value) {
this.thicknessListIconRadius.beginElement();
// 3rd case
} else if (annotationSelected.value !== 'text'
&& prevState.annotationSelected.value === 'text') {
this.thicknessListIconRadius.beginElement();
this.thicknessListIconColor.beginElement();
}
// 4th case, initial animation is triggered in componentDidMount
}