mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
blizzz 2018-02-22 15:57:43 +01:00 committed by GitHub
parent 3c30f29179 014fa8c686
commit 627023e9c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings/js/users/users.js
View File

@ -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) {
$('#userlist tr.active').removeClass('active'); if (!$(event.target).closest('.toggleUserActions').length) {
$('#userlist .popovermenu.open').removeClass('open'); $('#userlist tr.active').removeClass('active');
$('#userlist .popovermenu.open').removeClass('open');
}
}); });
$userListBody.on('click', '.action-togglestate', function (event) { $userListBody.on('click', '.action-togglestate', function (event) {

2
settings/templates/users/part.userlist.php
View File

@ -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>