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

bug fix: Fix recent regression with at-mentioning.

Browse Source 
One of my commits from yesterday erroneously set the
"mentioned" flag on messages that weren't mentioning
the current user, so you would get the pink/salmon
background when you sent at-mentions to other people.

Now we check the user_id before setting the flag.
This commit is contained in:
Steve Howell
2017-01-23 15:44:08 -08:00
committed by showell
parent 1e9baf8ee0
commit 01aad70910
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/echo.js
View File

@@ -64,6 +64,14 @@ people.add({
email: 'cordelia@zulip.com', email: 'cordelia@zulip.com',
}); });
people.add({
full_name: 'Leo',
user_id: 102,
email: 'leo@zulip.com',
});
people.initialize_current_user(101);
var stream_data = global.stream_data; var stream_data = global.stream_data;
var denmark = { var denmark = {
subscribed: false, subscribed: false,

4
static/js/echo.js
View File

@@ -46,7 +46,9 @@ exports.apply_markdown = function apply_markdown(message) {
userMentionHandler: function (name) { userMentionHandler: function (name) {
var person = people.get_by_name(name); var person = people.get_by_name(name);
if (person !== undefined) { if (person !== undefined) {
push_uniquely(message.flags, 'mentioned'); if (people.is_my_user_id(person.user_id)) {
push_uniquely(message.flags, 'mentioned');
}
return '<span class="user-mention" data-user-id="' + person.user_id + '">' + return '<span class="user-mention" data-user-id="' + person.user_id + '">' +
'@' + person.full_name + '@' + person.full_name +
'</span>'; '</span>';