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

compose: Fix websockets having been accidentally disabled. 

When we renamed use_socket to use_websockets, we only renamed it on
the backend, and thus it became effectively hardcoded to false.
This commit is contained in:
Tim Abbott 2016-12-28 09:24:12 -08:00
parent 3d015eb259
commit 5ad9a9d014
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/compose.js
View File

@ -443,7 +443,7 @@ function report_send_time(send_time, receive_time, display_time, locally_echoed,
}
var socket;
if (page_params.use_socket) {
if (page_params.use_websockets) {
socket = new Socket("/sockjs");
}
// For debugging. The socket will eventually move out of this file anyway.
@ -556,7 +556,7 @@ exports.send_message_success = function (local_id, message_id, start_time, local
exports.transmit_message = function (request, success, error) {
delete exports.send_times_data[request.id];
if (page_params.use_socket) {
if (page_params.use_websockets) {
send_message_socket(request, success, error);
} else {
send_message_ajax(request, success, error);