Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6073b281
Commit
6073b281
authored
Aug 10, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bug and a test.
parent
e39b3fe3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
...vascripts/diff_notes/components/jump_to_discussion.js.es6
+6
-4
No files found.
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
View file @
6073b281
...
@@ -64,8 +64,9 @@
...
@@ -64,8 +64,9 @@
discussionIdsInScope = discussionIdsForElements($(discussionsSelector));
discussionIdsInScope = discussionIdsForElements($(discussionsSelector));
let unresolvedDiscussionCount = 0;
let unresolvedDiscussionCount = 0;
for (const discussionId of discussionIdsInScope) {
const discussion = discussions[discussionId];
for (let i = 0; i < discussionIdsInScope.length; i++) {
const discussionId = discussionIdsInScope[i];
if (discussion && !discussion.isResolved()) {
if (discussion && !discussion.isResolved()) {
unresolvedDiscussionCount++;
unresolvedDiscussionCount++;
}
}
...
@@ -104,7 +105,8 @@
...
@@ -104,7 +105,8 @@
}
}
let currentDiscussionFound = false;
let currentDiscussionFound = false;
for (const discussionId of discussionIdsInScope) {
for (let i = 0; i < discussionIdsInScope.length; i++) {
const discussionId = discussionIdsInScope[i];
const discussion = discussions[discussionId];
const discussion = discussions[discussionId];
if (!discussion) {
if (!discussion) {
...
@@ -177,7 +179,7 @@
...
@@ -177,7 +179,7 @@
// If the next discussion is closed, toggle it open.
// If the next discussion is closed, toggle it open.
if ($target.find(".js-toggle-content").attr('style') == "display: none;") {
if ($target.find(".js-toggle-content").attr('style') == "display: none;") {
$target.find('i').toggleClass('fa fa-chevron-down').toggleClass('fa fa-chevron-up');
$target.find('
.js-toggle-button
i').toggleClass('fa fa-chevron-down').toggleClass('fa fa-chevron-up');
$target.find(".js-toggle-content").toggle();
$target.find(".js-toggle-content").toggle();
}
}
}
}
...
...
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