kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Don’t depend on unique class.

This commit is contained in:
Douwe Maan 2016-07-28 20:09:50 -06:00
parent 1c2eefef3f
commit 27471d01c2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
View File

@ -56,7 +56,7 @@
}
if (nextUnresolvedDiscussionId) {
$.scrollTo(`.${nextUnresolvedDiscussionId}`, {
$.scrollTo(`.discussion[data-discussion-id="${nextUnresolvedDiscussionId}"]`, {
offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
});
}

8
app/assets/javascripts/diff_notes/services/resolve.js.es6
View File

@ -83,13 +83,13 @@
}
updateUpdatedHtml(discussionId, data) {
const $discussionHeadline = $(`.${discussionId} .js-discussion-headline`);
const $discussionHeadline = $(`.discussion[data-discussion-id="${discussionId}"] .js-discussion-headline`);
if (data.updated_html) {
if (data.discussion_headline_html) {
if ($discussionHeadline.length) {
$discussionHeadline.replaceWith(data.updated_html);
$discussionHeadline.replaceWith(data.discussion_headline_html);
} else {
$(`.${discussionId} .discussion-header`).append(data.updated_html);
$(`.discussion[data-discussion-id="${discussionId}"] .discussion-header`).append(data.discussion_headline_html);
}
} else {
$discussionHeadline.remove();

2
app/views/discussions/_discussion.html.haml
View File

@ -5,7 +5,7 @@
= link_to user_path(discussion.author) do
= image_tag avatar_icon(discussion.author), class: "avatar s40"
.timeline-content
.discussion.js-toggle-container{ class: discussion.id }
.discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } }
.discussion-header
.discussion-actions
= link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do