Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clicking a message that is being edited should not open the 

main compose dialog for a reply.

(imported from commit 0a91b3c2ddba12ec33daf993dd13c1e7a7f4065c)
This commit is contained in:
Kevin Mehall 2013-06-11 12:54:07 -04:00
parent b906112c87
commit 5b4493926f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/static/js/message_edit.js
View File

@ -64,6 +64,10 @@ exports.start = function (row) {
});
};
exports.is_editing = function (id) {
return currently_editing_messages[id] !== undefined;
};
exports.end = function (row) {
var message = current_msg_list.get(rows.id(row));
if (currently_editing_messages[message.id] !== undefined) {

9
zephyr/static/js/ui.js
View File

@ -1039,7 +1039,14 @@ $(function () {
if (!(clicking && mouse_moved)) {
// Was a click (not a click-and-drag).
var row = $(this).closest(".message_row");
current_msg_list.select_id(rows.id(row));
var id = rows.id(row);
if (message_edit.is_editing(id)) {
// Clicks on a message being edited shouldn't trigger a reply.
return;
}
current_msg_list.select_id(id);
respond_to_cursor = true;
respond_to_message({trigger: 'message click'});
e.stopPropagation();