paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove flags parm in set_message_booleans.

Browse Source 
In all cases the value of `flags` we were passing in was
actually `message.flags` (although it was slightly obscured in
one place), so now we just pass in `message`.

(We also move a tiny bit of defensive code to set `flags`
into `set_message_booleans`.)
This commit is contained in:
Steve Howell
2017-12-16 16:40:43 -05:00
committed by showell
parent 7165bb1eea
commit e96b3ffc5a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/echo.js
View File

@@ -231,7 +231,7 @@ exports.process_from_server = function process_from_server(messages) {
// Update our flags based on what the server gave us. // Update our flags based on what the server gave us.
client_message.flags = message.flags; client_message.flags = message.flags;
message_store.set_message_booleans(client_message, client_message.flags); message_store.set_message_booleans(client_message);
// We don't try to highlight alert words locally, so we have to // We don't try to highlight alert words locally, so we have to
// do it now. (Note that we will indeed highlight alert words in // do it now. (Note that we will indeed highlight alert words in

2
static/js/message_events.js
View File

@@ -126,7 +126,7 @@ exports.update_messages = function update_messages(events) {
msgs_to_rerender.push(msg); msgs_to_rerender.push(msg);
msg.flags = event.flags; msg.flags = event.flags;
message_store.set_message_booleans(msg, event.flags); message_store.set_message_booleans(msg);
condense.un_cache_message_content_height(msg.id); condense.un_cache_message_content_height(msg.id);

9
static/js/message_store.js
View File

@@ -90,7 +90,10 @@ exports.insert_recent_private_message = (function () {
}; };
}()); }());
exports.set_message_booleans = function (message, flags) { exports.set_message_booleans = function (message) {
message.flags = message.flags || [];
var flags = message.flags;
function convert_flag(flag_name) { function convert_flag(flag_name) {
return flags.indexOf(flag_name) >= 0; return flags.indexOf(flag_name) >= 0;
} }
@@ -118,9 +121,7 @@ exports.add_message_metadata = function (message) {
message.sent_by_me = people.is_current_user(message.sender_email); message.sent_by_me = people.is_current_user(message.sender_email);
message.flags = message.flags || []; exports.set_message_booleans(message);
exports.set_message_booleans(message, message.flags);
people.extract_people_from_message(message); people.extract_people_from_message(message);
people.maybe_incr_recipient_count(message); people.maybe_incr_recipient_count(message);