paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-20 06:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Add option to disable websockets.

Browse Source 
This can be useful in scenarios where the network doesn't support
websockets.  We don't include it in prod_settings_template.py since
it's a very rare setting to need.

Fixes #1528.
This commit is contained in:
Zac Pullar-Strecker
2016-12-05 20:57:23 +00:00
committed by Tim Abbott
parent 84765e48a9
commit e6e11aefb3
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/compose.js
View File

@@ -442,7 +442,7 @@ function report_send_time(send_time, receive_time, display_time, locally_echoed,
}
var socket;
if (feature_flags.use_socket) {
if (page_params.use_socket) {
socket = new Socket("/sockjs");
}
// For debugging. The socket will eventually move out of this file anyway.
@@ -555,7 +555,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 (feature_flags.use_socket) {
if (page_params.use_socket) {
send_message_socket(request, success, error);
} else {
send_message_ajax(request, success, error);