4 Commits 05030d3859 ... f0a05ab205

Author SHA1 Message Date
  garthh f0a05ab205 Revert "Ember5" 10 months ago
  garthh 95a302c690 Revert "Ember5 épisode 2" 10 months ago
  garthh 021673d882 Merge branch 'main' of https://gitlab.portes-imaginaire.org/portes-imaginaire_org/discourse-bbb into main 10 months ago
  garthh a0920d9be8 back 10 months ago

+ 2 - 3
assets/javascripts/discourse/components/modal/insert-bbb.js.es6 → assets/javascripts/discourse-bbb/controllers/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: "",

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

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