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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c648756a
Commit
c648756a
authored
Aug 17, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix more incomplete if/else statements.
parent
d8654744
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
...vascripts/diff_notes/components/jump_to_discussion.js.es6
+2
-0
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
...ripts/diff_notes/components/resolve_discussion_btn.js.es6
+6
-0
No files found.
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
View file @
c648756a
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
allResolved: function () {
allResolved: function () {
if (this.discussion) {
if (this.discussion) {
return this.unresolvedDiscussionCount === 0;
return this.unresolvedDiscussionCount === 0;
} else {
return true;
}
}
},
},
showButton: function () {
showButton: function () {
...
...
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
View file @
c648756a
...
@@ -22,11 +22,15 @@
...
@@ -22,11 +22,15 @@
showButton: function () {
showButton: function () {
if (this.discussion) {
if (this.discussion) {
return this.discussion.isResolvable();
return this.discussion.isResolvable();
} else {
return undefined;
}
}
},
},
allResolved: function () {
allResolved: function () {
if (this.discussion) {
if (this.discussion) {
return this.discussion.isResolved();
return this.discussion.isResolved();
} else {
return undefined;
}
}
},
},
buttonText: function () {
buttonText: function () {
...
@@ -39,6 +43,8 @@
...
@@ -39,6 +43,8 @@
loading: function () {
loading: function () {
if (this.discussion) {
if (this.discussion) {
return this.discussion.loading;
return this.discussion.loading;
} else {
return undefined;
}
}
}
}
},
},
...
...
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