BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9b9c8678
Commit
9b9c8678
authored
Jul 25, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Jump to next discussion
Notes tab was renamed to show, was previously overridden in merge_request_tabs.js
parent
d95e6da0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
jump_to_discussion.js
...s/javascripts/diff_notes/components/jump_to_discussion.js
+5
-5
35232-next-unresolved.yml
changelogs/unreleased/35232-next-unresolved.yml
+4
-0
No files found.
app/assets/javascripts/diff_notes/components/jump_to_discussion.js
View file @
9b9c8678
...
...
@@ -94,7 +94,7 @@ const JumpToDiscussion = Vue.extend({
hasDiscussionsToJumpTo
=
false
;
}
}
}
else
if
(
activeTab
!==
'
notes
'
)
{
}
else
if
(
activeTab
!==
'
show
'
)
{
// If we are on the commits or builds tabs,
// there are no discussions to jump to.
hasDiscussionsToJumpTo
=
false
;
...
...
@@ -103,12 +103,12 @@ const JumpToDiscussion = Vue.extend({
if
(
!
hasDiscussionsToJumpTo
)
{
// If there are no discussions to jump to on the current page,
// switch to the notes tab and jump to the first disucssion there.
window
.
mrTabs
.
activateTab
(
'
notes
'
);
activeTab
=
'
notes
'
;
window
.
mrTabs
.
activateTab
(
'
show
'
);
activeTab
=
'
show
'
;
jumpToFirstDiscussion
=
true
;
}
if
(
activeTab
===
'
notes
'
)
{
if
(
activeTab
===
'
show
'
)
{
discussionsSelector
=
'.discussion[data-discussion-id]'
;
discussionIdsInScope
=
discussionIdsForElements
(
$
(
discussionsSelector
));
}
...
...
@@ -156,7 +156,7 @@ const JumpToDiscussion = Vue.extend({
let
$target
=
$
(
`
${
discussionsSelector
}
[data-discussion-id="
${
nextUnresolvedDiscussionId
}
"]`
);
if
(
activeTab
===
'
notes
'
)
{
if
(
activeTab
===
'
show
'
)
{
$target
=
$target
.
closest
(
'.note-discussion'
);
// If the next discussion is closed, toggle it open.
...
...
changelogs/unreleased/35232-next-unresolved.yml
0 → 100644
View file @
9b9c8678
---
title
:
fix jump to next discussion button
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment