Merge pull request #8416 from nextcloud/bugfix/8401/usermanagement-popover
Fix hiding and event propagation issues with the user management popover
This commit is contained in:
commit
627023e9c3
|
@ -940,7 +940,7 @@ $(document).ready(function () {
|
||||||
UserList._triggerGroupEdit($td, isSubadminSelect);
|
UserList._triggerGroupEdit($td, isSubadminSelect);
|
||||||
});
|
});
|
||||||
|
|
||||||
$userListBody.on('click', '.toggleUserActions', function (event) {
|
$userListBody.on('click', '.toggleUserActions > .action', function (event) {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
var $td = $(this).closest('td');
|
var $td = $(this).closest('td');
|
||||||
var $tr = $($td).closest('tr');
|
var $tr = $($td).closest('tr');
|
||||||
|
@ -963,9 +963,11 @@ $(document).ready(function () {
|
||||||
$tr.addClass('active');
|
$tr.addClass('active');
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document).on('mouseup', function () {
|
$(document).on('mouseup', function (event) {
|
||||||
|
if (!$(event.target).closest('.toggleUserActions').length) {
|
||||||
$('#userlist tr.active').removeClass('active');
|
$('#userlist tr.active').removeClass('active');
|
||||||
$('#userlist .popovermenu.open').removeClass('open');
|
$('#userlist .popovermenu.open').removeClass('open');
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$userListBody.on('click', '.action-togglestate', function (event) {
|
$userListBody.on('click', '.action-togglestate', function (event) {
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
<td class="userActions">
|
<td class="userActions">
|
||||||
<div class="toggleUserActions">
|
<div class="toggleUserActions">
|
||||||
<a class="action"><span class="icon-more"></span></a>
|
<a class="action"><span class="icon-more"></span></a>
|
||||||
<div class="popovermenu bubble menu">
|
<div class="popovermenu">
|
||||||
<ul class="userActionsMenu">
|
<ul class="userActionsMenu">
|
||||||
<li>
|
<li>
|
||||||
<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
|
<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
|
||||||
|
|
Loading…
Reference in New Issue