diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 6c9fb2e4c..111cf8181 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -21,6 +21,10 @@ template(name="editOrDeleteComment") = ' - ' a.js-delete-comment {{_ "delete"}} +template(name="deleteCommentPopup") + p {{_ "comment-delete"}} + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} + template(name="commentReactions") .reactions each reaction in reactions diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 6bb7f4f8e..eaad479ee 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -220,10 +220,11 @@ BlazeComponent.extendComponent({ return [ { // XXX We should use Popup.afterConfirmation here - 'click .js-delete-comment'() { - const commentId = this.currentData().activity.commentId; + 'click .js-delete-comment': Popup.afterConfirm('deleteComment', () => { + const commentId = this.data().activity.commentId; CardComments.remove(commentId); - }, + Popup.back(); + }), 'submit .js-edit-comment'(evt) { evt.preventDefault(); const commentText = this.currentComponent() diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 72abc2a37..727044ca1 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -271,6 +271,8 @@ "comment-placeholder": "Write Comment", "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", + "comment-delete": "Are you sure you want to delete the comment?", + "deleteCommentPopup-title": "Delete comment?", "no-comments": "No comments", "no-comments-desc": "Can not see comments and activities.", "worker": "Worker",