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
409bc054
Commit
409bc054
authored
Aug 18, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug causing “Jump to discussion” button not to show
parent
8b05e8c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
jump_to_discussion.js.es6
...vascripts/diff_notes/components/jump_to_discussion.js.es6
+2
-6
resolve_discussion_btn.js.es6
...ripts/diff_notes/components/resolve_discussion_btn.js.es6
+5
-5
No files found.
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
View file @
409bc054
...
@@ -14,11 +14,7 @@
...
@@ -14,11 +14,7 @@
return this.discussions[this.discussionId];
return this.discussions[this.discussionId];
},
},
allResolved: function () {
allResolved: function () {
if (this.discussion) {
return this.unresolvedDiscussionCount === 0;
return this.unresolvedDiscussionCount === 0;
} else {
return true;
}
},
},
showButton: function () {
showButton: function () {
if (this.discussionId) {
if (this.discussionId) {
...
@@ -66,7 +62,7 @@
...
@@ -66,7 +62,7 @@
discussionIdsInScope = discussionIdsForElements($(discussionsSelector));
discussionIdsInScope = discussionIdsForElements($(discussionsSelector));
let unresolvedDiscussionCount = 0;
let unresolvedDiscussionCount = 0;
for (let i = 0; i < discussionIdsInScope.length; i++) {
for (let i = 0; i < discussionIdsInScope.length; i++) {
const discussionId = discussionIdsInScope[i];
const discussionId = discussionIdsInScope[i];
if (discussion && !discussion.isResolved()) {
if (discussion && !discussion.isResolved()) {
...
...
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
View file @
409bc054
...
@@ -23,18 +23,18 @@
...
@@ -23,18 +23,18 @@
if (this.discussion) {
if (this.discussion) {
return this.discussion.isResolvable();
return this.discussion.isResolvable();
} else {
} else {
return
undefined
;
return
false
;
}
}
},
},
all
Resolved: function () {
isDiscussion
Resolved: function () {
if (this.discussion) {
if (this.discussion) {
return this.discussion.isResolved();
return this.discussion.isResolved();
} else {
} else {
return
undefined
;
return
false
;
}
}
},
},
buttonText: function () {
buttonText: function () {
if (this.
all
Resolved) {
if (this.
isDiscussion
Resolved) {
return "Unresolve discussion";
return "Unresolve discussion";
} else {
} else {
return "Resolve discussion";
return "Resolve discussion";
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
if (this.discussion) {
if (this.discussion) {
return this.discussion.loading;
return this.discussion.loading;
} else {
} else {
return
undefined
;
return
false
;
}
}
}
}
},
},
...
...
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