paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly render at-all and at-everyone mentions locally

Browse Source 
(imported from commit 9533b83dba6a61f6c09da755fca54e8a24ad61e6)
This commit is contained in:
Leo Franchi
2014-01-28 16:51:59 -05:00
parent 1666403850
commit e716a75d22
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/echo.js
View File

@@ -72,7 +72,9 @@ function add_message_flags(message) {
// Messages that mention the sender should highlight as well
var self_mention = 'data-user-email="' + page_params.email + '"';
if (message.content.indexOf(self_mention) > -1) {
var wildcard_mention = 'data-user-email="*"';
if (message.content.indexOf(self_mention) > -1 ||
message.content.indexOf(wildcard_mention) > -1) {
flags.push("mentioned");
}
@@ -310,6 +312,8 @@ function handleUserMentions(username) {
var person = people_by_name_dict.get(username);
return '<span class="user-mention" data-user-email="' + person.email + '">' +
'@' + person.full_name + '</span>';
} else if (username === 'all' || username === 'everyone') {
return '<span class="user-mention" data-user-email="*">' + '@' + username + '</span>';
} else {
return undefined;
}

8
zerver/tests/frontend/node/echo.js
View File

@@ -179,4 +179,12 @@ var bugdown_data = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../fix
assert.equal(message.flags.length, 2);
assert(message.flags.indexOf('read') !== -1);
assert(message.flags.indexOf('is_me_message') !== -1);
input = "testing this @**all**";
message = {subject: "No links here", content: echo.apply_markdown(input), raw_content: input};
echo._add_message_flags(message);
assert.equal(message.flags.length, 2);
assert(message.flags.indexOf('read') !== -1);
assert(message.flags.indexOf('mentioned') !== -1);
}());