소스 검색

Merge branch 'main' of https://gitlab.portes-imaginaire.org/portes-imaginaire_org/discourse-bbb into main

garthh 8 달 전
부모
커밋
4260fc5be8
2개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 0 0
      assets/javascripts/discourse/component/modal/insert-bbb.hbs
  2. 2 3
      assets/javascripts/discourse/component/modal/insert-bbb.js.es6

+ 0 - 0
assets/javascripts/discourse/templates/modal/insert-bbb.hbs → assets/javascripts/discourse/component/modal/insert-bbb.hbs


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