summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/comments/css/comments.scss5
-rw-r--r--apps/comments/js/commentstabview.js15
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);
}
});
},