diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-27 13:03:17 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-03 17:02:44 +0300 |
| commit | 8b977b295e887f7d134cd92ec352a24c0afd5950 (patch) | |
| tree | 44e540ef7bdfd9cbdbce312ad28b3f03f57c23f5 | |
| parent | 0904e9b107ce78fed80830e00b8fc3621cb98f8f (diff) | |
| download | gitlab-ce-8b977b295e887f7d134cd92ec352a24c0afd5950.tar.gz | |
Fixed some failing lint tests
4 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/javascripts/boards/components/modal/footer.js.es6 b/app/assets/javascripts/boards/components/modal/footer.js.es6 index 1be58b017ef..81b1aa1da77 100644 --- a/app/assets/javascripts/boards/components/modal/footer.js.es6 +++ b/app/assets/javascripts/boards/components/modal/footer.js.es6 @@ -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, { diff --git a/app/assets/javascripts/boards/components/modal/list.js.es6 b/app/assets/javascripts/boards/components/modal/list.js.es6 index a0b91e6f16a..c0c3f4b8d8f 100644 --- a/app/assets/javascripts/boards/components/modal/list.js.es6 +++ b/app/assets/javascripts/boards/components/modal/list.js.es6 @@ -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; } diff --git a/app/assets/javascripts/boards/models/issue.js.es6 b/app/assets/javascripts/boards/models/issue.js.es6 index 5b435a76467..2d0a295ae4d 100644 --- a/app/assets/javascripts/boards/models/issue.js.es6 +++ b/app/assets/javascripts/boards/models/issue.js.es6 @@ -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; diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index d3911ae233a..cf1c52a2b38 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -255,7 +255,7 @@ .form-control { display: inline-block; width: 210px; - margin-right: 10px + margin-right: 10px; } } |