summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diff_notes/models
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-11-22 11:47:26 +0000
committerPhil Hughes <me@iamphill.com>2016-11-22 11:47:26 +0000
commita085e3fb97c0ae9ebfd61f5045a28a5809252e45 (patch)
treef1ebaddbefc06cbd97bc9d2a2fdba9a196978ebc /app/assets/javascripts/diff_notes/models
parent0f590750307bdd871b20a8d87fc6963d95f2e00c (diff)
downloadgitlab-ce-a085e3fb97c0ae9ebfd61f5045a28a5809252e45.tar.gz
Fixed resolved discussion timeago not rendering
Closes #24787
Diffstat (limited to 'app/assets/javascripts/diff_notes/models')
-rw-r--r--app/assets/javascripts/diff_notes/models/discussion.js.es69
1 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/diff_notes/models/discussion.js.es6 b/app/assets/javascripts/diff_notes/models/discussion.js.es6
index 439f55520ef..badcdccc840 100644
--- a/app/assets/javascripts/diff_notes/models/discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/models/discussion.js.es6
@@ -57,14 +57,17 @@ class DiscussionModel {
}
updateHeadline (data) {
- const $discussionHeadline = $(`.discussion[data-discussion-id="${this.id}"] .js-discussion-headline`);
+ const discussionSelector = `.discussion[data-discussion-id="${this.id}"]`;
+ const $discussionHeadline = $(`${discussionSelector} .js-discussion-headline`);
if (data.discussion_headline_html) {
if ($discussionHeadline.length) {
$discussionHeadline.replaceWith(data.discussion_headline_html);
} else {
- $(`.discussion[data-discussion-id="${this.id}"] .discussion-header`).append(data.discussion_headline_html);
+ $(`${discussionSelector} .discussion-header`).append(data.discussion_headline_html);
}
+
+ gl.utils.localTimeAgo($('.js-timeago', `${discussionSelector}`));
} else {
$discussionHeadline.remove();
}
@@ -74,7 +77,7 @@ class DiscussionModel {
if (!this.canResolve) {
return false;
}
-
+
for (const noteId in this.notes) {
const note = this.notes[noteId];