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

echo: Cut dependency on compose.js.

Browse Source
This commit is contained in:
Tim Abbott
2023-05-31 17:02:28 -07:00
parent 16acb54e6a
commit c354d22454
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/echo.js
View File

@@ -3,7 +3,6 @@ import $ from "jquery";
import * as alert_words from "./alert_words"; import * as alert_words from "./alert_words";
import {all_messages_data} from "./all_messages_data"; import {all_messages_data} from "./all_messages_data";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
import * as compose from "./compose";
import * as compose_ui from "./compose_ui"; import * as compose_ui from "./compose_ui";
import * as drafts from "./drafts"; import * as drafts from "./drafts";
import * as local_message from "./local_message"; import * as local_message from "./local_message";
@@ -82,7 +81,7 @@ function failed_message_success(message_id) {
show_failed_message_success(message_id); show_failed_message_success(message_id);
} }
function resend_message(message, $row) { function resend_message(message, $row, on_send_message_success) {
message.content = message.raw_content; message.content = message.raw_content;
if (show_retry_spinner($row)) { if (show_retry_spinner($row)) {
// retry already in in progress // retry already in in progress
@@ -102,7 +101,7 @@ function resend_message(message, $row) {
hide_retry_spinner($row); hide_retry_spinner($row);
compose.send_message_success(local_id, message_id, locally_echoed); on_send_message_success(local_id, message_id, locally_echoed);
// Resend succeeded, so mark as no longer failed // Resend succeeded, so mark as no longer failed
failed_message_success(message_id); failed_message_success(message_id);
@@ -482,7 +481,7 @@ export function display_slow_send_loading_spinner(message) {
} }
} }
export function initialize() { export function initialize({on_send_message_success}) {
function on_failed_action(selector, callback) { function on_failed_action(selector, callback) {
$("#main_div").on("click", selector, function (e) { $("#main_div").on("click", selector, function (e) {
e.stopPropagation(); e.stopPropagation();
@@ -499,7 +498,7 @@ export function initialize() {
); );
return; return;
} }
callback(message, $row); callback(message, $row, on_send_message_success);
}); });
} }

2
web/src/ui_init.js
View File

@@ -664,7 +664,7 @@ export function initialize_everything() {
message_viewport.initialize(); message_viewport.initialize();
navbar_alerts.initialize(); navbar_alerts.initialize();
initialize_kitchen_sink_stuff(); initialize_kitchen_sink_stuff();
echo.initialize(); echo.initialize({on_send_message_success: compose.send_message_success});
stream_edit.initialize(); stream_edit.initialize();
user_group_edit.initialize(); user_group_edit.initialize();
stream_edit_subscribers.initialize(); stream_edit_subscribers.initialize();