Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable13] Fix hiding and event propagation issues with the user management popover #8517

Merged
merged 1 commit into from
Feb 23, 2018
Merged

[stable13] Fix hiding and event propagation issues with the user management popover #8517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions settings/js/users/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ $(document).ready(function () {
UserList._triggerGroupEdit($td, isSubadminSelect);
});

$userListBody.on('click', '.toggleUserActions', function (event) {
$userListBody.on('click', '.toggleUserActions > .action', function (event) {
event.stopPropagation();
var $td = $(this).closest('td');
var $tr = $($td).closest('tr');
Expand All @@ -963,9 +963,11 @@ $(document).ready(function () {
$tr.addClass('active');
});

$(document).on('mouseup', function () {
$('#userlist tr.active').removeClass('active');
$('#userlist .popovermenu.open').removeClass('open');
$(document).on('mouseup', function (event) {
if (!$(event.target).closest('.toggleUserActions').length) {
$('#userlist tr.active').removeClass('active');
$('#userlist .popovermenu.open').removeClass('open');
}
});

$userListBody.on('click', '.action-togglestate', function (event) {
Expand Down
2 changes: 1 addition & 1 deletion settings/templates/users/part.userlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<td class="userActions">
<div class="toggleUserActions">
<a class="action"><span class="icon-more"></span></a>
<div class="popovermenu bubble menu">
<div class="popovermenu">
<ul class="userActionsMenu">
<li>
<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
Expand Down