Merge pull request #841 from nextcloud/disable-contacts-menu-for-ment…

…ions-in-the-public-view Disable contacts menu for mentions in the public view
nextcloud · May 2, 2018 · 56bf670 · 56bf670
2 parents c431752 + 04bd307
commit 56bf670
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/css/comments.scss b/css/comments.scss
@@ -257,7 +257,7 @@ body:not(#body-public) #commentsTabView .comment .authorRow:not(.currentUser):no
 	color: $color-primary-text;
 }
 
-#commentsTabView .comment .message .mention-user:not(.current-user) {
+body:not(#body-public) #commentsTabView .comment:not(.newCommentRow) .message .mention-user:not(.current-user) {
 	cursor: pointer;
 }
 

diff --git a/js/views/chatview.js b/js/views/chatview.js
@@ -502,6 +502,11 @@
 		},
 
 		_postRenderMessage: function($el) {
+			// Contacts menu is not shown in public view.
+			if (!OC.getCurrentUser().uid) {
+				return;
+			}
+
 			$el.find('.mention-user').each(function() {
 				var $this = $(this);