paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 03:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Extract transmit.js from compose.js.

Browse Source 
We now isolate the code to transmit messages into transmit.js.
It is stable code that most folks doing UI work in compose.js don't
care about the details of, so it's just clutter there.  Also, we may
soon have other widgets than the compose box that send messages.

This change mostly preserves test coverage, although in some cases
we stub at a higher level for the compose path (this is a good thing).
Extracting out transmit.js allows us to lock down 100% coverage on that
file.
This commit is contained in:
Steve Howell
2018-02-20 07:08:50 -05:00
committed by Tim Abbott
parent 80ff3d8da5
commit 1f6ddf0110
8 changed files with 259 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
static/js/compose.js
View File

@@ -188,46 +188,6 @@ function nonexistent_stream_reply_error() {
exports.nonexistent_stream_reply_error = nonexistent_stream_reply_error;
function send_message_ajax(request, success, error) {
channel.post({
url: '/json/messages',
data: request,
success: success,
error: function (xhr, error_type) {
if (error_type !== 'timeout' && reload.is_pending()) {
// The error might be due to the server changing
reload.initiate({immediate: true,
save_pointer: true,
save_narrow: true,
save_compose: true,
send_after_reload: true});
return;
}
var response = channel.xhr_error_message("Error sending message", xhr);
error(response);
},
});
}
var socket;
if (page_params.use_websockets) {
socket = new Socket("/sockjs");
}
// For debugging. The socket will eventually move out of this file anyway.
exports._socket = socket;
function send_message_socket(request, success, error) {
request.socket_user_agent = navigator.userAgent;
socket.send(request, success, function (type, resp) {
var err_msg = "Error sending message";
if (type === 'response') {
err_msg += ": " + resp.msg;
}
error(err_msg);
});
}
function clear_compose_box() {
$("#compose-textarea").val('').focus();
drafts.delete_draft_after_send();
@@ -246,24 +206,6 @@ exports.send_message_success = function (local_id, message_id, locally_echoed) {
echo.reify_message_id(local_id, message_id);
};
exports.transmit_message = function (request, on_success, error) {
function success(data) {
// Call back to our callers to do things like closing the compose
// box and turning off spinners and reifying locally echoed messages.
on_success(data);
// Once everything is done, get ready to report times to the server.
sent_messages.report_server_ack(request.local_id);
}
if (page_params.use_websockets) {
send_message_socket(request, success, error);
} else {
send_message_ajax(request, success, error);
}
};
exports.send_message = function send_message(request) {
if (request === undefined) {
request = create_message_object();
@@ -317,7 +259,7 @@ exports.send_message = function send_message(request) {
echo.message_send_error(local_id, response);
}
exports.transmit_message(request, success, error);
transmit.send_message(request, success, error);
server_events.assert_get_events_running("Restarting get_events because it was not running during send");
if (locally_echoed) {
@@ -418,7 +360,7 @@ exports.schedule_message = function schedule_message(request, success, error) {
return;
}
exports.transmit_message(request, success, error);
transmit.send_message(request, success, error);
};
exports.enter_with_preview_open = function () {