From 5ea98b4df39cab2c29081de2746e994ca11b5948 Mon Sep 17 00:00:00 2001 From: Mark VanLandingham Date: Tue, 13 Jul 2021 09:57:10 -0500 Subject: [PATCH] DEV: App event when modal is closed (#13722) --- .../discourse/app/routes/application.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js index 0f697564f75..4f9558c292f 100644 --- a/app/assets/javascripts/discourse/app/routes/application.js +++ b/app/assets/javascripts/discourse/app/routes/application.js @@ -170,11 +170,19 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, { const controller = getOwner(this).lookup( `controller:${controllerName}` ); - if (controller && controller.onClose) { - controller.onClose({ - initiatedByCloseButton: initiatedBy === "initiatedByCloseButton", - initiatedByClickOut: initiatedBy === "initiatedByClickOut", + + if (controller) { + this.appEvents.trigger("modal:closed", { + name: controllerName, + controller: controller, }); + + if (controller.onClose) { + controller.onClose({ + initiatedByCloseButton: initiatedBy === "initiatedByCloseButton", + initiatedByClickOut: initiatedBy === "initiatedByClickOut", + }); + } } modalController.set("name", null); }