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

Make local_echo an official feature.

Browse Source 
This commit removes all references to feature_flags.local_echo.
It's been a core feature for about four years, so I think we
can safely say the experiment was successful.:)
This commit is contained in:
Steve Howell
2017-05-09 10:34:42 -07:00
committed by Tim Abbott
parent 0a0f567aeb
commit 94b7058743
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
static/js/compose.js
View File

@@ -296,15 +296,13 @@ function clear_compose_box() {
} }
exports.send_message_success = function (local_id, message_id, start_time, locally_echoed) { exports.send_message_success = function (local_id, message_id, start_time, locally_echoed) {
if (! feature_flags.local_echo || !locally_echoed) { if (!locally_echoed) {
clear_compose_box(); clear_compose_box();
} }
process_send_time(message_id, start_time, locally_echoed); process_send_time(message_id, start_time, locally_echoed);
if (feature_flags.local_echo) { echo.reify_message_id(local_id, message_id);
echo.reify_message_id(local_id, message_id);
}
setTimeout(function () { setTimeout(function () {
if (exports.send_times_data[message_id].received === undefined) { if (exports.send_times_data[message_id].received === undefined) {
@@ -336,13 +334,13 @@ function send_message(request) {
var start_time = new Date(); var start_time = new Date();
var local_id; var local_id;
if (feature_flags.local_echo) {
local_id = echo.try_deliver_locally(request); local_id = echo.try_deliver_locally(request);
if (local_id !== undefined) { if (local_id !== undefined) {
// We delivered this message locally // We delivered this message locally
request.local_id = local_id; request.local_id = local_id;
}
} }
var locally_echoed = local_id !== undefined; var locally_echoed = local_id !== undefined;
function success(data) { function success(data) {
@@ -352,7 +350,7 @@ function send_message(request) {
function error(response) { function error(response) {
// If we're not local echo'ing messages, or if this message was not // If we're not local echo'ing messages, or if this message was not
// locally echoed, show error in compose box // locally echoed, show error in compose box
if (!feature_flags.local_echo || request.local_id === undefined) { if (request.local_id === undefined) {
compose_error(response, $('#new_message_content')); compose_error(response, $('#new_message_content'));
return; return;
} }
@@ -363,7 +361,7 @@ function send_message(request) {
exports.transmit_message(request, success, error); exports.transmit_message(request, success, error);
server_events.assert_get_events_running("Restarting get_events because it was not running during send"); server_events.assert_get_events_running("Restarting get_events because it was not running during send");
if (feature_flags.local_echo && locally_echoed) { if (locally_echoed) {
clear_compose_box(); clear_compose_box();
} }
} }

1
static/js/feature_flags.js
View File

@@ -5,7 +5,6 @@ var exports = {};
// Manually-flipped debugging flags // Manually-flipped debugging flags
exports.log_send_times = false; exports.log_send_times = false;
exports.collect_send_times = false; exports.collect_send_times = false;
exports.local_echo = true;
// Experimental modification to support much wider message views. // Experimental modification to support much wider message views.
exports.full_width = false; exports.full_width = false;

4
static/js/markdown.js
View File

@@ -222,10 +222,6 @@ function python_to_js_filter(pattern, url) {
exports.set_realm_filters = function (realm_filters) { exports.set_realm_filters = function (realm_filters) {
// Update the marked parser with our particular set of realm filters // Update the marked parser with our particular set of realm filters
if (!feature_flags.local_echo) {
return;
}
realm_filter_map = {}; realm_filter_map = {};
realm_filter_list = []; realm_filter_list = [];