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

Revert "buddy list: Put "me" at the top of the list." 

This reverts commit 1890c30ee1.
This commit is contained in:
Tim Abbott 2018-11-27 17:36:28 -08:00
parent ee3b4f3ee9
commit d5f2eb3790
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend_tests/node_tests/activity.js
View File

@ -340,9 +340,9 @@ run_test('presence_list_full_update', () => {
}); });
assert.deepEqual(user_ids, [ assert.deepEqual(user_ids, [
me.user_id,
fred.user_id, fred.user_id,
jill.user_id, jill.user_id,
me.user_id,
norbert.user_id, norbert.user_id,
zoe.user_id, zoe.user_id,
alice.user_id, alice.user_id,
@ -426,21 +426,18 @@ run_test('group_update_dom_counts', () => {
run_test('handlers', () => { run_test('handlers', () => {
// This is kind of weak coverage; we are mostly making sure that // This is kind of weak coverage; we are mostly making sure that
// keys and clicks got mapped to functions that don't crash. // keys and clicks got mapped to functions that don't crash.
let me_li;
let alice_li; let alice_li;
let fred_li; let fred_li;
function init() { function init() {
reset_setup(); reset_setup();
buddy_list.populate({ buddy_list.populate({
keys: [me.user_id, alice.user_id, fred.user_id], keys: [alice.user_id, fred.user_id],
}); });
me_li = $.create('me stub');
alice_li = $.create('alice stub'); alice_li = $.create('alice stub');
fred_li = $.create('fred stub'); fred_li = $.create('fred stub');
buddy_list_add(me.user_id, me_li);
buddy_list_add(alice.user_id, alice_li); buddy_list_add(alice.user_id, alice_li);
buddy_list_add(fred.user_id, fred_li); buddy_list_add(fred.user_id, fred_li);
} }

2
frontend_tests/node_tests/buddy_data.js
View File

@ -27,8 +27,6 @@ function make_people() {
is_bot: true, is_bot: true,
}; };
people.add_in_realm(bot); people.add_in_realm(bot);
people.initialize_current_user(99999);
} }
make_people(); make_people();

5
static/js/buddy_data.js
View File

@ -31,11 +31,6 @@ var fade_config = {
}; };
function level(user_id) { function level(user_id) {
if (people.is_my_user_id(user_id)) {
// Always put current user at the top.
return 0;
}
var status = presence.get_status(user_id); var status = presence.get_status(user_id);
switch (status) { switch (status) {