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

Toggle user sidebar popover when chevron clicked again

Browse Source 
Fixes Trac #1679.

(imported from commit 998f3497f22f83297c9afd7c3e8ea6446b8a06db)
This commit is contained in:
Scott Feeney
2013-08-28 16:10:33 -04:00
parent ade55dc39c
commit c98deb5988
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
static/js/popovers.js
View File

@@ -150,7 +150,7 @@ exports.hide_stream_sidebar_popover = function () {
exports.hide_user_sidebar_popover = function () { exports.hide_user_sidebar_popover = function () {
if (user_sidebar_popped()) { if (user_sidebar_popped()) {
current_user_sidebar_elem.popover("destroy"); $(current_user_sidebar_elem).closest("li").popover("destroy");
current_user_sidebar_elem = undefined; current_user_sidebar_elem = undefined;
} }
}; };
@@ -172,13 +172,21 @@ exports.register_click_handlers = function () {
show_message_info_popover(this, rows.id(row)); show_message_info_popover(this, rows.id(row));
}); });
$('#user_presences').on('click', 'span.arrow', function (e) { $('#user_presences').on('click', 'span.arrow', function (e) {
var elt = e.target;
if (user_sidebar_popped() && current_user_sidebar_elem === elt) {
// If the popover is already shown, clicking again should toggle it.
popovers.hide_user_sidebar_popover();
e.stopPropagation();
return;
}
var last_sidebar_elem = current_user_sidebar_elem; var last_sidebar_elem = current_user_sidebar_elem;
popovers.hide_all(); popovers.hide_all();
popovers.show_userlist_sidebar(); popovers.show_userlist_sidebar();
var target = $(e.target).closest('li'); var target = $(elt).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');
@@ -190,7 +198,7 @@ exports.register_click_handlers = function () {
fixed: true fixed: true
}); });
target.popover("show"); target.popover("show");
current_user_sidebar_elem = target; current_user_sidebar_elem = elt;
e.stopPropagation(); e.stopPropagation();
}); });