Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-01 12:15:15 +0300
committerPhil Hughes <me@iamphill.com>2016-08-01 12:15:15 +0300
commitf65d8eb3261f717340a8e8fd8a3fe65bd9fd2c20 (patch)
tree121d3addca4a1118977b80fd380a5619354cb66a /app/assets
parent9accca43c3b2cdd8d2c3e4def335555afcfca35d (diff)
Updated method name to be more descriptive
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/diff_notes/components/resolve_btn.js.es62
-rw-r--r--app/assets/javascripts/diff_notes/services/resolve.js.es67
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
index d6101c2d035..b2542e6664d 100644
--- a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
@@ -70,7 +70,7 @@
const resolved_by = data ? data.resolved_by : null;
CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, resolved_by);
- ResolveService.updateUpdatedHtml(this.discussionId, data);
+ ResolveService.updateDiscussionHeadline(this.discussionId, data);
} else {
new Flash('An error occurred when trying to resolve a comment. Please try again.', 'alert');
}
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index a1ddd260c65..fe07ab39d5e 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -47,7 +47,6 @@
}
discussion.loading = true;
- console.log(discussion.loading);
return this.discussionResource.save({
mergeRequestId,
@@ -59,7 +58,7 @@
discussion.resolveAllNotes(resolved_by);
discussion.loading = false;
- this.updateUpdatedHtml(discussionId, data);
+ this.updateDiscussionHeadline(discussionId, data);
} else {
new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert');
}
@@ -83,14 +82,14 @@
discussion.unResolveAllNotes();
discussion.loading = false;
- this.updateUpdatedHtml(discussionId, data);
+ this.updateDiscussionHeadline(discussionId, data);
} else {
new Flash('An error occurred when trying to unresolve a discussion. Please try again.', 'alert');
}
});
}
- updateUpdatedHtml(discussionId, data) {
+ updateDiscussionHeadline(discussionId, data) {
const $discussionHeadline = $(`.discussion[data-discussion-id="${discussionId}"] .js-discussion-headline`);
if (data.discussion_headline_html) {