summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-02-07 09:32:01 +0000
committerPhil Hughes <me@iamphill.com>2017-02-07 09:32:01 +0000
commit799c9738f729b773feb65360023434de85142428 (patch)
tree453ac6e84608ab06cc0fa547211e23b16791f4ac
parent5c2eeb9a681bd538fcafee2522abbc156959b0e0 (diff)
downloadgitlab-ce-issue-boards-vue-components.tar.gz
-rw-r--r--app/assets/javascripts/boards/boards_bundle.js.es64
-rw-r--r--app/assets/javascripts/boards/components/board.js.es61
-rw-r--r--app/assets/javascripts/boards/components/board_card.js.es61
-rw-r--r--app/assets/javascripts/boards/components/board_header.js.es65
-rw-r--r--app/assets/javascripts/boards/components/board_list.js.es61
-rw-r--r--app/assets/javascripts/boards/components/board_sidebar.js.es61
-rw-r--r--app/assets/javascripts/boards/components/sidebar/assignee.js.es62
-rw-r--r--app/assets/javascripts/vue_common_component/bs_dropdown_menu.js.es63
8 files changed, 12 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6
index b0821438910..db53e3edbb7 100644
--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -12,7 +12,7 @@ requireAll(require.context('./stores', true, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./services', true, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./mixins', true, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./filters', true, /^\.\/.*\.(js|es6)$/));
-const board = require('./components/board');
+const boardComponent = require('./components/board');
const boardSidebar = require('./components/board_sidebar');
require('./components/new_list_dropdown');
require('./components/modal/index');
@@ -34,7 +34,7 @@ $(() => {
gl.IssueBoardsApp = new Vue({
el: $boardApp,
components: {
- board,
+ board: boardComponent,
boardSidebar,
'board-add-issues-modal': gl.issueBoards.IssuesModal,
},
diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6
index 4e847500b34..8d65a6b952b 100644
--- a/app/assets/javascripts/boards/components/board.js.es6
+++ b/app/assets/javascripts/boards/components/board.js.es6
@@ -5,6 +5,7 @@
const boardBlankState = require('./board_blank_state');
const boardList = require('./board_list');
const boardHeader = require('./board_header');
+
const Store = gl.issueBoards.BoardsStore;
module.exports = Vue.extend({
diff --git a/app/assets/javascripts/boards/components/board_card.js.es6 b/app/assets/javascripts/boards/components/board_card.js.es6
index 0fa00a5d0b3..ee14ed73196 100644
--- a/app/assets/javascripts/boards/components/board_card.js.es6
+++ b/app/assets/javascripts/boards/components/board_card.js.es6
@@ -2,6 +2,7 @@
/* global Vue */
const issueCardInner = require('./issue_card_inner');
+
const Store = gl.issueBoards.BoardsStore;
module.exports = Vue.extend({
diff --git a/app/assets/javascripts/boards/components/board_header.js.es6 b/app/assets/javascripts/boards/components/board_header.js.es6
index 944c59133f1..831259b8142 100644
--- a/app/assets/javascripts/boards/components/board_header.js.es6
+++ b/app/assets/javascripts/boards/components/board_header.js.es6
@@ -1,3 +1,4 @@
+/* global Vue */
const boardDelete = require('./board_delete');
module.exports = Vue.extend({
@@ -48,11 +49,11 @@ module.exports = Vue.extend({
boardDelete,
},
props: [
- 'disabled', 'list', 'canAdminList', 'canAdminIssue'
+ 'disabled', 'list', 'canAdminList', 'canAdminIssue',
],
methods: {
showNewIssueForm() {
this.$parent.$refs['board-list'].showIssueForm = !this.$parent.$refs['board-list'].showIssueForm;
- }
+ },
},
});
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index a4df4ad1492..9353379fba3 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -4,6 +4,7 @@
const boardCard = require('./board_card');
const boardNewIssue = require('./board_new_issue');
+
const Store = gl.issueBoards.BoardsStore;
module.exports = Vue.extend({
diff --git a/app/assets/javascripts/boards/components/board_sidebar.js.es6 b/app/assets/javascripts/boards/components/board_sidebar.js.es6
index c52ff454eb2..9c8fa46f79e 100644
--- a/app/assets/javascripts/boards/components/board_sidebar.js.es6
+++ b/app/assets/javascripts/boards/components/board_sidebar.js.es6
@@ -7,6 +7,7 @@
const removeBtn = require('./sidebar/remove_issue');
require('./sidebar/assignee');
+
const Store = gl.issueBoards.BoardsStore;
module.exports = Vue.extend({
diff --git a/app/assets/javascripts/boards/components/sidebar/assignee.js.es6 b/app/assets/javascripts/boards/components/sidebar/assignee.js.es6
index 5272f30f71f..e3b6cd9c280 100644
--- a/app/assets/javascripts/boards/components/sidebar/assignee.js.es6
+++ b/app/assets/javascripts/boards/components/sidebar/assignee.js.es6
@@ -90,7 +90,7 @@ require('../../../vue_common_component/bs_dropdown_menu');
],
computed: {
assigneeUrl() {
- return `${gon.relative_url_root}/${this.issue.assignee.username}`
+ return `${gon.relative_url_root}/${this.issue.assignee.username}`;
},
currentUsername() {
return this.currentUser.username || false;
diff --git a/app/assets/javascripts/vue_common_component/bs_dropdown_menu.js.es6 b/app/assets/javascripts/vue_common_component/bs_dropdown_menu.js.es6
index d6ba8862b85..a7475fba7bf 100644
--- a/app/assets/javascripts/vue_common_component/bs_dropdown_menu.js.es6
+++ b/app/assets/javascripts/vue_common_component/bs_dropdown_menu.js.es6
@@ -1,3 +1,4 @@
+/* global Vue */
(() => {
Vue.component('bs-dropdown-menu', {
props: {
@@ -69,5 +70,5 @@
return classNamesObject;
},
},
- })
+ });
})();