Browse Source
Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentions
Fix contacts menu on mentions
pull/10847/head
blizzz
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
12 additions and
8 deletions
-
apps/comments/css/comments.scss
-
apps/comments/js/commentstabview.js
|
|
|
@ -254,3 +254,8 @@ |
|
|
|
.app-files .action-comment { |
|
|
|
padding: 16px 14px; |
|
|
|
} |
|
|
|
|
|
|
|
#commentsTabView .comment .message .contactsmenu-popover { |
|
|
|
left: -6px; |
|
|
|
top: 24px; |
|
|
|
} |
|
|
|
@ -442,14 +442,13 @@ |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
$el.find('.avatar').each(function() { |
|
|
|
var avatar = $(this); |
|
|
|
var strong = $(this).next(); |
|
|
|
var appendTo = $(this).parent(); |
|
|
|
|
|
|
|
var username = $(this).data('username'); |
|
|
|
if (username !== oc_current_user) { |
|
|
|
$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo); |
|
|
|
$el.find('.avatar-name-wrapper').each(function() { |
|
|
|
var $this = $(this); |
|
|
|
var $avatar = $this.find('.avatar'); |
|
|
|
|
|
|
|
var user = $avatar.data('user'); |
|
|
|
if (user !== OC.getCurrentUser().uid) { |
|
|
|
$this.contactsMenu(user, 0, $this); |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
