diff options
author | Regis <boudinot.regis@yahoo.com> | 2017-01-06 13:56:53 -0700 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-01-06 13:56:53 -0700 |
commit | 6bf0bd0fba08320ffa0dc4ef3af7910d9aa14ae6 (patch) | |
tree | 89c7f2bbb056a44f855ba6d5635afeaadfb28d9a | |
parent | fc026c8a179620889b0c686ae28264f4f3649e6d (diff) | |
download | gitlab-ce-6bf0bd0fba08320ffa0dc4ef3af7910d9aa14ae6.tar.gz |
no space for requires - all consistent syntax = change if logic for index.js.es6
3 files changed, 31 insertions, 38 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/index.js.es6 b/app/assets/javascripts/vue_pipelines_index/index.js.es6 index bad24ce41d0..d2971139a53 100644 --- a/app/assets/javascripts/vue_pipelines_index/index.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/index.js.es6 @@ -1,21 +1,17 @@ /* global Vue, VueResource, gl */ /* eslint-disable no-bitwise, no-plusplus*/ - /*= require vue_common_component/commit */ - -//= require vue-resource - +/*= require vue-resource /*= require boards/vue_resource_interceptor */ - -//= require ./status.js.es6 -//= require ./store.js.es6 -//= require ./pipeline_url.js.es6 -//= require ./pipeline_head.js.es6 -//= require ./stage.js.es6 -//= require ./stages.js.es6 -//= require ./pipeline_actions.js.es6 -//= require ./time_ago.js.es6 -//= require ./pipelines.js.es6 +/*= require ./status.js.es6 */ +/*= require ./store.js.es6 */ +/*= require ./pipeline_url.js.es6 */ +/*= require ./pipeline_head.js.es6 */ +/*= require ./stage.js.es6 */ +/*= require ./stages.js.es6 */ +/*= require ./pipeline_actions.js.es6 */ +/*= require ./time_ago.js.es6 */ +/*= require ./pipelines.js.es6 */ (() => { const project = document.querySelector('.pipelines'); @@ -24,27 +20,24 @@ Vue.use(VueResource); - if (entry) { - return new Vue({ - el: entry, - data: { - scope: project.dataset.url, - store: new gl.PipelineStore(), - svgs: svgs.dataset, - }, - components: { - 'vue-pipelines': gl.VuePipelines, - }, - template: ` - <vue-pipelines - :scope='scope' - :store='store' - :svgs='svgs' - > - </vue-pipelines> - `, - }); - } - - return null; + if (!entry) return null; + return new Vue({ + el: entry, + data: { + scope: project.dataset.url, + store: new gl.PipelineStore(), + svgs: svgs.dataset, + }, + components: { + 'vue-pipelines': gl.VuePipelines, + }, + template: ` + <vue-pipelines + :scope='scope' + :store='store' + :svgs='svgs' + > + </vue-pipelines> + `, + }); })(); diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6 index 137b08224a7..0b0c60d0551 100644 --- a/app/assets/javascripts/vue_pipelines_index/store.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6 @@ -1,6 +1,5 @@ /* global gl, Flash */ /* eslint-disable no-param-reassign, no-underscore-dangle */ - /*= require vue_realtime_listener/index.js */ ((gl) => { diff --git a/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6 b/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6 index 7559fd55803..257352b8087 100644 --- a/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6 @@ -1,5 +1,6 @@ /* global Vue, gl */ /* eslint-disable no-param-reassign */ + ((gl) => { gl.VueTimeAgo = Vue.extend({ data() { |