diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-02-18 13:43:56 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-02-23 11:10:03 +0100 |
| commit | fef3f2349262122a31a0b3830a1cc3e53014433d (patch) | |
| tree | adabf01f8531ab4d0abb38c6ea9ef2b26f9bfe13 /settings | |
| parent | a5b73fe761cc6c17200559725e3bd1ff489913df (diff) | |
| download | nextcloud-server-fef3f2349262122a31a0b3830a1cc3e53014433d.tar.gz nextcloud-server-fef3f2349262122a31a0b3830a1cc3e53014433d.zip | |
Fix hiding and event propagation issues with the user management popover
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/users/users.js | 10 | ||||
| -rw-r--r-- | settings/templates/users/part.userlist.php | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 5a337c38556..0b94401941b 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -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'); @@ -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) { diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php index aaf20b6eaef..2506dba7fc3 100644 --- a/settings/templates/users/part.userlist.php +++ b/settings/templates/users/part.userlist.php @@ -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> |