diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-28 18:37:02 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 09:43:54 +0000 |
| commit | 9972f59f94ab017d27d9278dd1c9dd89da489e64 (patch) | |
| tree | 275a7a19643ddeedd755f174c4599fc43d8aec1f | |
| parent | 037b4fe939696eebe6295a858470f2661d1e3878 (diff) | |
| download | gitlab-ce-9972f59f94ab017d27d9278dd1c9dd89da489e64.tar.gz | |
Use single source of truth for vue_resource_interceptor
4 files changed, 6 insertions, 13 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6 index f9766471780..5b53cfe59cd 100644 --- a/app/assets/javascripts/boards/boards_bundle.js.es6 +++ b/app/assets/javascripts/boards/boards_bundle.js.es6 @@ -13,7 +13,7 @@ //= require ./components/board //= require ./components/board_sidebar //= require ./components/new_list_dropdown -//= require ./vue_resource_interceptor +//= require vue_shared/vue_resource_interceptor $(() => { const $boardApp = document.getElementById('board-app'); diff --git a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 deleted file mode 100644 index 54c2b4ad369..00000000000 --- a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 +++ /dev/null @@ -1,10 +0,0 @@ -/* eslint-disable func-names, prefer-arrow-callback, no-unused-vars */ -/* global Vue */ - -Vue.http.interceptors.push((request, next) => { - Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1; - - next(function (response) { - Vue.activeResources -= 1; - }); -}); diff --git a/app/assets/javascripts/vue_pipelines_index/index.js.es6 b/app/assets/javascripts/vue_pipelines_index/index.js.es6 index 36f861a7d02..9ca7b1a746c 100644 --- a/app/assets/javascripts/vue_pipelines_index/index.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/index.js.es6 @@ -2,7 +2,7 @@ /*= require vue_shared/components/commit */ /*= require vue_pagination/index */ /*= require vue-resource -/*= require boards/vue_resource_interceptor */ +/*= require vue_shared/vue_resource_interceptor */ /*= require ./status.js.es6 */ /*= require ./store.js.es6 */ /*= require ./pipeline_url.js.es6 */ diff --git a/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6 b/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6 index 0b20bf66a69..f602a0c44c2 100644 --- a/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6 +++ b/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6 @@ -19,10 +19,13 @@ props: { /** - * Stores the Pipelines to render. + * Object used to store the Pipelines to render. * It's passed as a prop to allow different stores to use this Component. * Different API calls can result in different responses, using a custom * store allows us to use the same pipeline component. + * + * Note: All provided stores need to have a `storePipelines` method. + * Find a better way to do this. */ store: { type: Object, |