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

buddy list: Sidebar menu now uses user_id, not email.

This commit is contained in:
Steve Howell 2016-11-15 05:22:52 -08:00 committed by Tim Abbott
parent b90057d557
commit f5e1dcd11d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
static/js/popovers.js
View File

@ -349,22 +349,28 @@ exports.register_click_handlers = function () {
}); });
$('body').on('click', '.user_popover .narrow_to_private_messages', function (e) { $('body').on('click', '.user_popover .narrow_to_private_messages', function (e) {
var email = $(e.target).parents('ul').attr('data-email'); var user_id = $(e.target).parents('ul').attr('data-user-id');
var email = people.get_person_from_user_id(user_id).email;
popovers.hide_user_sidebar_popover(); popovers.hide_user_sidebar_popover();
narrow.by('pm-with', email, {select_first_unread: true, trigger: 'user sidebar popover'}); narrow.by('pm-with', email, {select_first_unread: true, trigger: 'user sidebar popover'});
e.stopPropagation(); e.stopPropagation();
}); });
$('body').on('click', '.user_popover .narrow_to_messages_sent', function (e) { $('body').on('click', '.user_popover .narrow_to_messages_sent', function (e) {
var email = $(e.target).parents('ul').attr('data-email'); var user_id = $(e.target).parents('ul').attr('data-user-id');
var email = people.get_person_from_user_id(user_id).email;
popovers.hide_user_sidebar_popover(); popovers.hide_user_sidebar_popover();
narrow.by('sender', email, {select_first_unread: true, trigger: 'user sidebar popover'}); narrow.by('sender', email, {select_first_unread: true, trigger: 'user sidebar popover'});
e.stopPropagation(); e.stopPropagation();
}); });
$('body').on('click', '.user_popover .compose_private_message', function (e) { $('body').on('click', '.user_popover .compose_private_message', function (e) {
var email = $(e.target).parents('ul').attr('data-email'); var user_id = $(e.target).parents('ul').attr('data-user-id');
var email = people.get_person_from_user_id(user_id).email;
popovers.hide_user_sidebar_popover(); popovers.hide_user_sidebar_popover();
compose.start('private', {"private_message_recipient": email, trigger: 'sidebar user actions'}); compose.start('private', {"private_message_recipient": email, trigger: 'sidebar user actions'});
e.stopPropagation(); e.stopPropagation();
}); });
@ -393,6 +399,7 @@ exports.register_click_handlers = function () {
var target = $(this).closest('li'); var target = $(this).closest('li');
var email = target.find('a').attr('data-email'); var email = target.find('a').attr('data-email');
var name = target.find('a').attr('data-name'); var name = target.find('a').attr('data-name');
var user_id = people.get_user_id(email);
if (current_user_sidebar_email === email) { if (current_user_sidebar_email === email) {
// If the popover is already shown, clicking again should toggle it. // If the popover is already shown, clicking again should toggle it.
@ -404,7 +411,7 @@ exports.register_click_handlers = function () {
if (userlist_placement === "right") { if (userlist_placement === "right") {
popovers.show_userlist_sidebar(); popovers.show_userlist_sidebar();
} }
var template_vars = {email: email, name: name}; var template_vars = {user_id: user_id, name: name};
var content = templates.render('user_sidebar_actions', template_vars); var content = templates.render('user_sidebar_actions', template_vars);
target.popover({ target.popover({

2
static/templates/user_sidebar_actions.handlebars
View File

@ -1,5 +1,5 @@
{{! Contents of the "user actions" popup }} {{! Contents of the "user actions" popup }}
<ul class="nav nav-list user_popover" data-email="{{email}}"> <ul class="nav nav-list user_popover" data-user-id="{{user_id}}">
<li> <li>
<a class="narrow_to_private_messages"> <a class="narrow_to_private_messages">
<i class="icon-vector-user"></i> <i class="icon-vector-user"></i>