paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add explicit message field for locally_echoed.

Browse Source 
We now set locally_echoed to true for messages that are
locally echoed, and we change some of our code to look
for this flag.
This commit is contained in:
Steve Howell
2017-07-17 10:52:57 -04:00
committed by Tim Abbott
parent fca158e387
commit 0e25055c1d
10 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/message_edit.js
View File

@@ -36,7 +36,7 @@ function get_editability(message, edit_limit_seconds_buffer) {
// Locally echoed messages are not editable, since the message hasn't
// finished being sent yet.
if (message.local_id !== undefined) {
if (message.locally_echoed) {
return editability_types.NO;
}
@@ -87,7 +87,7 @@ exports.save = function (row, from_topic_edited_only) {
}
// Editing a not-yet-acked message (because the original send attempt failed)
// just results in the in-memory message being changed
if (message.local_id !== undefined) {
if (message.locally_echoed) {
if (new_content !== message.raw_content || topic_changed) {
echo.edit_locally(message, new_content, topic_changed ? new_topic : undefined);
row = current_msg_list.get_row(message_id);
@@ -307,7 +307,7 @@ function edit_message(row, raw_content) {
edit_obj.scrolled_by = scroll_by;
message_viewport.scrollTop(message_viewport.scrollTop() + scroll_by);
if (feature_flags.propagate_topic_edits && message.local_id === undefined) {
if (feature_flags.propagate_topic_edits && !message.locally_echoed) {
var original_topic = message.subject;
message_edit_topic.keyup( function () {
var new_topic = message_edit_topic.val();