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

Extract reactions.set_reaction_count.

Browse Source
This commit is contained in:
Steve Howell
2017-05-29 11:24:31 -06:00
committed by Tim Abbott
parent 1747223c35
commit affff8ac82
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend_tests/node_tests/reactions.js
View File

@@ -127,6 +127,17 @@ set_global('message_store', {
reactions.message_reaction_on_click(message_id, emoji_name); reactions.message_reaction_on_click(message_id, emoji_name);
}()); }());
(function test_set_reaction_count() {
var count_element = $('count-stub');
var reaction_element = $('reaction-stub');
reaction_element.add_child('.message_reaction_count', count_element);
reactions.set_reaction_count(reaction_element, 5);
assert.equal(count_element.html(), '5');
}());
(function test_add_reaction() { (function test_add_reaction() {
var event = { var event = {
message_id: 1001, message_id: 1001,
@@ -199,5 +210,6 @@ set_global('message_store', {
reactions.add_reaction(event); reactions.add_reaction(event);
assert(title_set); assert(title_set);
assert.equal(count_element.html(), '2');
}()); }());

11
static/js/reactions.js
View File

@@ -256,6 +256,11 @@ exports.get_add_reaction_button = function (message_id) {
return add_button; return add_button;
}; };
exports.set_reaction_count = function (reaction, count) {
var count_element = reaction.find('.message_reaction_count');
count_element.html(count);
};
exports.add_reaction = function (event) { exports.add_reaction = function (event) {
var message_id = event.message_id; var message_id = event.message_id;
var emoji_name = event.emoji_name; var emoji_name = event.emoji_name;
@@ -291,9 +296,8 @@ exports.update_existing_reaction = function (event, user_list) {
var emoji_name = event.emoji_name; var emoji_name = event.emoji_name;
var reaction = exports.find_reaction(message_id, emoji_name); var reaction = exports.find_reaction(message_id, emoji_name);
var count_element = reaction.find('.message_reaction_count');
count_element.html(user_list.length); exports.set_reaction_count(reaction, user_list.length);
var new_title = generate_title(emoji_name, user_list); var new_title = generate_title(emoji_name, user_list);
reaction.prop('title', new_title); reaction.prop('title', new_title);
@@ -381,8 +385,7 @@ exports.remove_reaction = function (event) {
var new_title = generate_title(emoji_name, user_list); var new_title = generate_title(emoji_name, user_list);
reaction.prop('title', new_title); reaction.prop('title', new_title);
var count_element = reaction.find('.message_reaction_count'); exports.set_reaction_count(reaction, user_list.length);
count_element.html(user_list.length);
if (user_id === page_params.user_id) { if (user_id === page_params.user_id) {
reaction.removeClass("reacted"); reaction.removeClass("reacted");