Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modal: Add support for event handler on closing a modal. 

Part of implementing #20373.
This commit is contained in:
Ganesh Pawar 2022-01-27 12:35:35 +05:30 committed by Tim Abbott
parent 01335d7492
commit 73533e578a
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/dialog_widget.js
View File

@ -1,5 +1,4 @@
import $ from "jquery";
import Micromodal from "micromodal";
import render_dialog_widget from "../templates/dialog_widget.hbs";
@ -59,8 +58,9 @@ export function show_dialog_spinner() {
loading.make_indicator(spinner);
}
export function close_modal() {
Micromodal.close("dialog_widget_modal");
// Supports a callback to be called once the modal finishes closing.
export function close_modal(on_hidden_callback) {
overlays.close_modal("dialog_widget_modal", {micromodal: true, on_hidden: on_hidden_callback});
}
export function launch(conf) {

22
static/js/overlays.js
View File

@ -179,7 +179,9 @@ export function open_modal(selector, conf) {
conf.on_shown();
}
} else if (animation_name === "mmfadeOut") {
// Equivalent to bootstrap's "hidden.bs.modal" event
// Equivalent to bootstrap's "hidden.bs.modal" event.
//
// Call the on_hidden callback after the modal finishes hiding.
micromodal.removeClass("modal--open");
if (conf.autoremove) {
@ -254,7 +256,9 @@ export function close_active() {
close_overlay(open_overlay_name);
}
// If conf.micromodal is true, close a micromodal modal else close a bootstrap modal
// `conf` is an object with the following optional properties:
// * micromodal: true if the modal to close is expected to be micromodal.
// * on_hidden: Callback to run when the modal finishes hiding.
export function close_modal(selector, conf) {
if (selector === undefined) {
blueslip.error("Undefined selector was passed into close_modal");
@ -279,6 +283,20 @@ export function close_modal(selector, conf) {
blueslip.debug("close modal: " + selector);
if (conf && conf.micromodal) {
const id_selector = `#${selector}`;
const micromodal = $(id_selector);
// On-hidden hooks should typically be registered in
// overlays.open_modal. However, we offer this alternative
// mechanism as a convenience for hooks only known when
// closing the modal.
micromodal.find(".modal__container").on("animationend", (event) => {
const animation_name = event.originalEvent.animationName;
if (animation_name === "mmfadeOut" && conf.on_hidden) {
conf.on_hidden();
}
});
Micromodal.close(selector);
return;
}