Commit 69c7fc5f authored by Phil Hughes's avatar Phil Hughes

Jumps between discussions on the changes tab

Ordered the jump to discussion by order in the DOM
parent 433f1c42
......@@ -43,38 +43,34 @@
},
methods: {
jumpToNextUnresolvedDiscussion: function () {
let nextUnresolvedDiscussionId,
firstUnresolvedDiscussionId,
useNextDiscussionId = false,
i = 0;
let unresolvedIds = CommentsStore.unresolvedDiscussionIds(),
nextUnresolvedDiscussionId;
const activePage = $('.merge-request-tabs .active a').attr('data-action'),
$diffDiscussions = $('.discussion').filter(function () {
return unresolvedIds.indexOf($(this).attr('data-discussion-id')) !== -1;
});
for (const discussionId in this.discussions) {
const discussion = this.discussions[discussionId];
unresolvedIds = unresolvedIds.sort(function (a, b) {
return $diffDiscussions.index(`[data-discussion-id="${b}"]`) > $diffDiscussions.index(`[data-discussion-id="${a}"]`);
});
if (!discussion.isResolved()) {
if (i === 0) {
firstUnresolvedDiscussionId = discussion.id;
unresolvedIds.forEach(function (discussionId, i) {
if (this.discussionId && discussionId === this.discussionId) {
nextUnresolvedDiscussionId = unresolvedIds[i + 1];
return;
}
}.bind(this));
if (useNextDiscussionId) {
nextUnresolvedDiscussionId = discussion.id;
break;
}
nextUnresolvedDiscussionId = nextUnresolvedDiscussionId || unresolvedIds[0];
if (this.discussionId && discussion.id === this.discussionId) {
useNextDiscussionId = true;
}
if (nextUnresolvedDiscussionId) {
let selector = '.discussion';
i++;
}
if (activePage === 'diffs' && $(`${selector}[data-discussion-id="${nextUnresolvedDiscussionId}"]`).length) {
selector = '.diffs .notes';
}
nextUnresolvedDiscussionId = nextUnresolvedDiscussionId || firstUnresolvedDiscussionId
if (nextUnresolvedDiscussionId) {
mrTabs.activateTab('notes');
$.scrollTo(`.discussion[data-discussion-id="${nextUnresolvedDiscussionId}"]`, {
$.scrollTo(`${selector}[data-discussion-id="${nextUnresolvedDiscussionId}"]`, {
offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
});
}
......
......@@ -26,6 +26,19 @@
if (discussion.notesCount() === 0) {
Vue.delete(this.state, discussionId);
}
},
unresolvedDiscussionIds: function () {
let ids = [];
for (const discussionId in this.state) {
const discussion = this.state[discussionId];
if (!discussion.isResolved()) {
ids.push(discussion.id);
}
}
return ids;
}
};
})(window);
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