diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2018-02-22 15:57:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 15:57:43 +0100 |
| commit | 627023e9c3876f7a1dc8d2798a582aa1d0d92a26 (patch) | |
| tree | 6199c00878f8fcbe17c33ce09eb8ced6765d5ebb /settings | |
| parent | 3c30f291799ce9eb077a06e6417998c1e67827c3 (diff) | |
| parent | 014fa8c6860d1824c172da4d4ea2c56906968b28 (diff) | |
| download | nextcloud-server-627023e9c3876f7a1dc8d2798a582aa1d0d92a26.tar.gz nextcloud-server-627023e9c3876f7a1dc8d2798a582aa1d0d92a26.zip | |
Merge pull request #8416 from nextcloud/bugfix/8401/usermanagement-popover
Fix hiding and event propagation issues with the user management popover
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> |