paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Migrate Bootstrap modal calls to overlay calls.

Browse Source 
In d0f8515b50, it was noticed that
Bootstrap's `hide` and `show` calls can cause race conditions.
So, migrate to our `overlay` calls to handle Bootstrap modals.
This commit is contained in:
Ganesh Pawar
2021-04-29 12:03:00 +05:30
committed by Tim Abbott
parent 6e4735a4e9
commit fe147757c9
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
static/js/message_edit.js
View File

@@ -18,6 +18,7 @@ import * as markdown from "./markdown";
import * as message_lists from "./message_lists";
import * as message_store from "./message_store";
import * as message_viewport from "./message_viewport";
import * as overlays from "./overlays";
import {page_params} from "./page_params";
import * as resize from "./resize";
import * as rows from "./rows";
@@ -918,7 +919,7 @@ function hide_delete_btn_show_spinner(deleting) {
export function delete_message(msg_id) {
$("#delete-message-error").html("");
$("#delete_message_modal").modal("show");
overlays.open_modal("#delete_message_modal");
if (currently_deleting_messages.includes(msg_id)) {
hide_delete_btn_show_spinner(true);
} else {
@@ -934,7 +935,7 @@ export function delete_message(msg_id) {
channel.del({
url: "/json/messages/" + msg_id,
success() {
$("#delete_message_modal").modal("hide");
overlays.close_modal("#delete_message_modal");
currently_deleting_messages = currently_deleting_messages.filter(
(id) => id !== msg_id,
);
@@ -962,7 +963,7 @@ export function delete_topic(stream_id, topic_name) {
topic_name,
},
success() {
$("#delete_topic_modal").modal("hide");
overlays.close_modal("#delete_topic_modal");
},
});
}
@@ -988,7 +989,7 @@ export function move_topic_containing_message_to_stream(
(id) => id !== message_id,
);
hide_topic_move_spinner();
$("#move_topic_modal").modal("hide");
overlays.close_modal("#move_topic_modal");
}
if (currently_topic_editing_messages.includes(message_id)) {
hide_topic_move_spinner();