mirror of
https://github.com/wekan/wekan.git
synced 2026-03-12 08:32:33 +01:00
Resolve merge conflicts by accepting PR #6131 changes
Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
parent
dc0b68ee80
commit
97dd5d2064
257 changed files with 9483 additions and 14103 deletions
|
|
@ -275,7 +275,7 @@ Template.commentReactions.events({
|
|||
cardComment.toggleReaction(codepoint);
|
||||
}
|
||||
},
|
||||
'click .open-comment-reaction-popup': Popup.open('addReaction'),
|
||||
'click .open-comment-reaction-popup': Popup.open('addReaction', {showHeader: false})
|
||||
})
|
||||
|
||||
Template.addReactionPopup.events({
|
||||
|
|
@ -306,6 +306,11 @@ Template.addReactionPopup.helpers({
|
|||
'😊',
|
||||
'🤔',
|
||||
'😔'];
|
||||
},
|
||||
hasUserReacted(codepoint) {
|
||||
const commentId = Template.instance().data.commentId;
|
||||
const cardComment = ReactiveCache.getCardComment(commentId);
|
||||
return cardComment.hasUserReacted(codepoint);
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue