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

frontend: Keep showing hover menu after opening popovers.

Browse Source 
Fixes: #3172
This commit is contained in:
Yago González
2017-01-10 16:21:02 +00:00
committed by Tim Abbott
parent e6ab93a4c4
commit a613bc43fe
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
static/js/popovers.js
View File

@@ -47,6 +47,7 @@ function show_message_info_popover(element, id) {
exports.toggle_reactions_popover = function (element, id) {
var last_popover_elem = current_message_reactions_popover_elem;
popovers.hide_all();
$(element).closest('.message_row').toggleClass('has_popover has_reactions_popover');
if (last_popover_elem !== undefined
&& last_popover_elem.get()[0] === element) {
// We want it to be the case that a user can dismiss a popover
@@ -119,6 +120,7 @@ exports.toggle_reactions_popover = function (element, id) {
exports.toggle_actions_popover = function (element, id) {
var last_popover_elem = current_actions_popover_elem;
popovers.hide_all();
$(element).closest('.message_row').toggleClass('has_popover has_actions_popover');
if (last_popover_elem !== undefined
&& last_popover_elem.get()[0] === element) {
// We want it to be the case that a user can dismiss a popover
@@ -833,6 +835,7 @@ exports.any_active = function () {
};
exports.hide_all = function () {
$('.has_popover').removeClass('has_popover has_actions_popover has_reactions_popover');
popovers.hide_actions_popover();
popovers.hide_message_info_popover();
popovers.hide_reactions_popover();

12
static/styles/zulip.css
View File

@@ -595,7 +595,8 @@ td.pointer {
margin-bottom: 10px;
}
.message_list .message_row:hover .message_time {
.message_list .message_row:hover .message_time,
.message_list .has_popover .message_time {
display: none;
}
@@ -1028,7 +1029,7 @@ a.message_label_clickable:hover {
width: 0px;
height: 0px;
color: #bbb;
opacity: 0;
visibility: hidden;
}
.reactions_hover i {
@@ -1040,9 +1041,11 @@ a.message_label_clickable:hover {
padding: 1px 2px;
}
.message_hovered .reactions_hover {
.message_hovered .reactions_hover,
.has_reactions_popover .reactions_hover
{
cursor: pointer;
opacity: 1.0;
visibility: visible;
}
/* Brighten text because of the dark background */
@@ -1084,6 +1087,7 @@ a.dark_background:hover,
}
.message_hovered .info,
.has_actions_popover .info,
.message_hovered .empty-star {
visibility: visible;
}