kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed some failing lint tests

Browse source
This commit is contained in:
Phil Hughes 2017-01-27 13:03:17 +00:00 committed by Fatih Acet
parent 0904e9b107
commit 8b977b295e
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/boards/components/modal/footer.js.es6
View file

@ -26,7 +26,7 @@
},
addIssues() {
const list = this.selectedList;
const issueIds = this.selectedIssues.map(issue => issue._id);
const issueIds = this.selectedIssues.map(issue => issue.globalId);
// Post the data to the backend
this.$http.post(this.bulkUpdatePath, {

9
app/assets/javascripts/boards/components/modal/list.js.es6
View file

@ -31,13 +31,13 @@
},
methods: {
toggleIssue: ModalStore.toggleIssue.bind(ModalStore),
listHeight () {
listHeight() {
return this.$refs.list.getBoundingClientRect().height;
},
scrollHeight () {
scrollHeight() {
return this.$refs.list.scrollHeight;
},
scrollTop () {
scrollTop() {
return this.$refs.list.scrollTop + this.listHeight();
},
showIssue(issue) {
@ -70,7 +70,8 @@
this.$refs.list.onscroll = () => {
const currentPage = Math.floor(this.issues.length / this.perPage);
if ((this.scrollTop() > this.scrollHeight() - 100) && !this.loadingNewPage && currentPage === this.page) {
if ((this.scrollTop() > this.scrollHeight() - 100) && !this.loadingNewPage
&& currentPage === this.page) {
this.loadingNewPage = true;
this.page += 1;
}

2
app/assets/javascripts/boards/models/issue.js.es6
View file

@ -6,7 +6,7 @@
class ListIssue {
constructor (obj) {
this._id = obj.id;
this.globalId = obj.id;
this.id = obj.iid;
this.title = obj.title;
this.confidential = obj.confidential;

2
app/assets/stylesheets/pages/boards.scss
View file

@ -255,7 +255,7 @@
.form-control {
display: inline-block;
width: 210px;
margin-right: 10px
margin-right: 10px;
}
}