Don’t depend on unique class.
This commit is contained in:
parent
1c2eefef3f
commit
27471d01c2
3 changed files with 6 additions and 6 deletions
|
@ -56,7 +56,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nextUnresolvedDiscussionId) {
|
if (nextUnresolvedDiscussionId) {
|
||||||
$.scrollTo(`.${nextUnresolvedDiscussionId}`, {
|
$.scrollTo(`.discussion[data-discussion-id="${nextUnresolvedDiscussionId}"]`, {
|
||||||
offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
|
offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,13 +83,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
updateUpdatedHtml(discussionId, data) {
|
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) {
|
if ($discussionHeadline.length) {
|
||||||
$discussionHeadline.replaceWith(data.updated_html);
|
$discussionHeadline.replaceWith(data.discussion_headline_html);
|
||||||
} else {
|
} else {
|
||||||
$(`.${discussionId} .discussion-header`).append(data.updated_html);
|
$(`.discussion[data-discussion-id="${discussionId}"] .discussion-header`).append(data.discussion_headline_html);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$discussionHeadline.remove();
|
$discussionHeadline.remove();
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
= link_to user_path(discussion.author) do
|
= link_to user_path(discussion.author) do
|
||||||
= image_tag avatar_icon(discussion.author), class: "avatar s40"
|
= image_tag avatar_icon(discussion.author), class: "avatar s40"
|
||||||
.timeline-content
|
.timeline-content
|
||||||
.discussion.js-toggle-container{ class: discussion.id }
|
.discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } }
|
||||||
.discussion-header
|
.discussion-header
|
||||||
.discussion-actions
|
.discussion-actions
|
||||||
= link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
|
= link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
|
||||||
|
|
Loading…
Reference in a new issue