Commit b0464fa4 authored by Clement Ho's avatar Clement Ho

Merge branch '35232-next-unresolved' into 'master'

fix Jump to next discussion

Closes #35232

See merge request !13076
parents 2f05a6a4 9b9c8678
...@@ -94,7 +94,7 @@ const JumpToDiscussion = Vue.extend({ ...@@ -94,7 +94,7 @@ const JumpToDiscussion = Vue.extend({
hasDiscussionsToJumpTo = false; hasDiscussionsToJumpTo = false;
} }
} }
} else if (activeTab !== 'notes') { } else if (activeTab !== 'show') {
// If we are on the commits or builds tabs, // If we are on the commits or builds tabs,
// there are no discussions to jump to. // there are no discussions to jump to.
hasDiscussionsToJumpTo = false; hasDiscussionsToJumpTo = false;
...@@ -103,12 +103,12 @@ const JumpToDiscussion = Vue.extend({ ...@@ -103,12 +103,12 @@ const JumpToDiscussion = Vue.extend({
if (!hasDiscussionsToJumpTo) { if (!hasDiscussionsToJumpTo) {
// If there are no discussions to jump to on the current page, // If there are no discussions to jump to on the current page,
// switch to the notes tab and jump to the first disucssion there. // switch to the notes tab and jump to the first disucssion there.
window.mrTabs.activateTab('notes'); window.mrTabs.activateTab('show');
activeTab = 'notes'; activeTab = 'show';
jumpToFirstDiscussion = true; jumpToFirstDiscussion = true;
} }
if (activeTab === 'notes') { if (activeTab === 'show') {
discussionsSelector = '.discussion[data-discussion-id]'; discussionsSelector = '.discussion[data-discussion-id]';
discussionIdsInScope = discussionIdsForElements($(discussionsSelector)); discussionIdsInScope = discussionIdsForElements($(discussionsSelector));
} }
...@@ -156,7 +156,7 @@ const JumpToDiscussion = Vue.extend({ ...@@ -156,7 +156,7 @@ const JumpToDiscussion = Vue.extend({
let $target = $(`${discussionsSelector}[data-discussion-id="${nextUnresolvedDiscussionId}"]`); let $target = $(`${discussionsSelector}[data-discussion-id="${nextUnresolvedDiscussionId}"]`);
if (activeTab === 'notes') { if (activeTab === 'show') {
$target = $target.closest('.note-discussion'); $target = $target.closest('.note-discussion');
// If the next discussion is closed, toggle it open. // If the next discussion is closed, toggle it open.
......
---
title: fix jump to next discussion button
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment