From 8ed29dfce52f88b9f1342c0242ff857239282057 Mon Sep 17 00:00:00 2001 From: Tainan Felipe Date: Fri, 21 Jun 2019 14:39:12 -0300 Subject: [PATCH 1/2] Fix undefined in client startup --- .../imports/ui/components/modal/fullscreen/component.jsx | 1 + .../imports/ui/components/modal/simple/component.jsx | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx index 12a9000833..ef83479faf 100644 --- a/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx @@ -49,6 +49,7 @@ const defaultProps = { disabled: false, }, dismiss: { + callback: () => {}, disabled: false, }, preventClosing: false, diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx index b7a01dea46..77ee48d999 100755 --- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx @@ -37,7 +37,12 @@ class ModalSimple extends Component { } handleDismiss() { - this.props.modalHide(this.props.dismiss.callback); + const { + modalHide, + dismiss, + } = this.props; + if (!dismiss && !modalHide) return; + modalHide(dismiss.callback); } render() { From c7527d6fdf6e0a08b03b5257467bc34309309eb1 Mon Sep 17 00:00:00 2001 From: Tainan Felipe Date: Fri, 21 Jun 2019 14:47:10 -0300 Subject: [PATCH 2/2] Update bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx Co-Authored-By: Anton Georgiev --- .../imports/ui/components/modal/simple/component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx index 77ee48d999..81489af74c 100755 --- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx @@ -41,7 +41,7 @@ class ModalSimple extends Component { modalHide, dismiss, } = this.props; - if (!dismiss && !modalHide) return; + if (!dismiss || !modalHide) return; modalHide(dismiss.callback); }