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

message edit: Only enable left-arrow-editing for content.

Browse Source 
We no longer let the left arrow put you into the message edit
UI for a message where you can only edit topics, since that is
just confusing to most users.

This change also improves error handling a bit, and it removes
an unnecessary call to rows.id().

Finally, it moves some logic out of message_list.js, so that we
don't have a circular dependency for this codepath.

Fixes #4259
This commit is contained in:
Steve Howell
2017-03-27 09:00:31 -07:00
parent c0a6038a95
commit 293c89ba94
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
static/js/message_edit.js
View File

@@ -373,19 +373,36 @@ exports.maybe_show_edit = function (row, id) {
};
exports.edit_last_sent_message = function () {
var msg = current_msg_list.get_last_own_editable_message();
if (msg !== undefined) {
var msg_row = current_msg_list.get_row(msg.id);
current_msg_list.select_id(rows.id(msg_row), {then_scroll: true, from_scroll: true});
message_edit.start(msg_row, function () {
var editability_type = message_edit.get_editability(msg, 5);
if (editability_type === message_edit.editability_types.TOPIC_ONLY) {
ui_util.focus_on('message_edit_topic');
} else {
ui_util.focus_on('message_edit_content');
}
});
var msg = current_msg_list.get_last_message_sent_by_me();
if (!msg) {
return;
}
if (!msg.id) {
blueslip.error('Message has invalid id in edit_last_sent_message.');
return;
}
var msg_editability_type = exports.get_editability(msg, 5);
if (msg_editability_type !== editability_types.FULL) {
return;
}
var msg_row = current_msg_list.get_row(msg.id);
if (!msg_row) {
// This should never happen, since we got the message above
// from current_msg_list.
blueslip.error('Could not find row for id ' + msg.id);
return;
}
current_msg_list.select_id(msg.id, {then_scroll: true, from_scroll: true});
// Finally do the real work!
message_edit.start(msg_row, function () {
ui_util.focus_on('message_edit_content');
});
};
exports.show_history = function (message) {

9
static/js/message_list.js
View File

@@ -645,18 +645,13 @@ exports.MessageList.prototype = {
}, 0);
},
get_last_own_editable_message: function MessageList_get_last_own_editable_message() {
get_last_message_sent_by_me: function () {
var msg_index = _.findLastIndex(this._items, {sender_id: page_params.user_id});
if (msg_index === -1) {
return;
}
var msg = this._items[msg_index];
var msg_editability_type = message_edit.get_editability(msg, 5);
if (msg_editability_type !== message_edit.editability_types.NO &&
msg_editability_type !== message_edit.editability_types.NO_LONGER) {
return msg;
}
return;
return msg;
},
};