diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2018-09-18 11:42:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 11:42:26 +0200 |
| commit | 7f6d42c26346e79160d3f4e02802eddf8057902f (patch) | |
| tree | 660ea58fc7b1550259552fa63ce2fdc508b1809c /apps/comments | |
| parent | 7ab19366dc34e17eacdaa58bfbb54b9221491a1c (diff) | |
| parent | 9cb8b51d4238f15cc61860f7ac68f97128d87d55 (diff) | |
| download | nextcloud-server-7f6d42c26346e79160d3f4e02802eddf8057902f.tar.gz nextcloud-server-7f6d42c26346e79160d3f4e02802eddf8057902f.zip | |
Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentions
Fix contacts menu on mentions
Diffstat (limited to 'apps/comments')
| -rw-r--r-- | apps/comments/css/comments.scss | 5 | ||||
| -rw-r--r-- | apps/comments/js/commentstabview.js | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/apps/comments/css/comments.scss b/apps/comments/css/comments.scss index 84d328ca6f5..e631d6891ff 100644 --- a/apps/comments/css/comments.scss +++ b/apps/comments/css/comments.scss @@ -254,3 +254,8 @@ .app-files .action-comment { padding: 16px 14px; } + +#commentsTabView .comment .message .contactsmenu-popover { + left: -6px; + top: 24px; +} diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 3c428fe86a6..28382c8b67e 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -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); } }); }, |