garthh 10 months ago
parent
commit
a0920d9be8

+ 6 - 4
assets/javascripts/discourse/templates/modal/insert-bbb.hbs → assets/javascripts/discourse/components/modal/insert-bbb.hbs

@@ -1,4 +1,5 @@
-<DModalBody @title="bbb.modal.title" @class="insert-bbb">
+<DModal @closeModal={{@closeModal}}>
+<:body @title="bbb.modal.title" @class="insert-bbb">
   <div class="insert-bbb-form">
     <div class="insert-bbb-input">
       <label>{{i18n "bbb.meetingID"}}</label>
@@ -25,9 +26,9 @@
     </div>
 
   </div>
-</DModalBody>
+</:body>
 
-<div class="modal-footer">
+<:footer>
   <DButton
     @class="btn-primary"
     @disabled={{insertDisabled}}
@@ -39,4 +40,5 @@
     @label="bbb.modal.cancel"
     @action={{action "cancel"}}
   />
-</div>
+</:footer>
+</DModal>

+ 2 - 3
assets/javascripts/discourse-bbb/controllers/insert-bbb.js.es6 → assets/javascripts/discourse/components/modal/insert-bbb.js.es6

@@ -1,5 +1,4 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Controller from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 
@@ -12,7 +11,7 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  onShow() {
+  init() {
     this.setProperties({
       meetingID: "",
       attendeePW: "",