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

Merge pull request #11350 from nextcloud/stable14-11258-fix-contacts-menu-on-mentions 

[stable14] Fix contacts menu on mentions
This commit is contained in:
blizzz 2018-09-26 15:30:36 +02:00 committed by GitHub
parent 6c4f3ac1d6 c274344160
commit 1b493b783d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/comments/css/comments.scss
View File

@ -254,3 +254,8 @@
.app-files .action-comment {
padding: 16px 14px;
}
#commentsTabView .comment .message .contactsmenu-popover {
left: -6px;
top: 24px;
}

13
apps/comments/js/commentstabview.js
View File

@ -442,14 +442,13 @@
return;
}
$el.find('.avatar').each(function() {
var avatar = $(this);
var strong = $(this).next();
var appendTo = $(this).parent();
$el.find('.avatar-name-wrapper').each(function() {
var $this = $(this);
var $avatar = $this.find('.avatar');
var username = $(this).data('username');
if (username !== oc_current_user) {
$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
var user = $avatar.data('user');
if (user !== OC.getCurrentUser().uid) {
$this.contactsMenu(user, 0, $this);
}
});
},