diff options
author | Phil Hughes <me@iamphill.com> | 2017-03-17 11:12:11 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-03-21 09:52:49 +0000 |
commit | 6094b306dc759ffc0cea7c7cb0193d11bc9f1fa2 (patch) | |
tree | eeda1983133e2cfb462058a39ffa2eb4ff7473bf /app/assets/javascripts/boards | |
parent | f592cae12992f86d711973a82296abfd7bf05bc4 (diff) | |
download | gitlab-ce-6094b306dc759ffc0cea7c7cb0193d11bc9f1fa2.tar.gz |
Show loading icon when changing filter in add issues modal
Closes #29615
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r-- | app/assets/javascripts/boards/components/modal/filters.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/index.js | 15 | ||||
-rw-r--r-- | app/assets/javascripts/boards/stores/modal_store.js | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/boards/components/modal/filters.js b/app/assets/javascripts/boards/components/modal/filters.js index bd394a2318c..9cbb2100c9a 100644 --- a/app/assets/javascripts/boards/components/modal/filters.js +++ b/app/assets/javascripts/boards/components/modal/filters.js @@ -15,7 +15,7 @@ export default { this.filteredSearch = new FilteredSearchBoards(this.store); this.filteredSearch.removeTokens(); }, - beforeDestroy() { + destroyed() { this.filteredSearch.cleanup(); FilteredSearchContainer.container = document; this.store.path = ''; diff --git a/app/assets/javascripts/boards/components/modal/index.js b/app/assets/javascripts/boards/components/modal/index.js index 4240c97617d..1af31c99107 100644 --- a/app/assets/javascripts/boards/components/modal/index.js +++ b/app/assets/javascripts/boards/components/modal/index.js @@ -64,8 +64,15 @@ require('./empty_state'); }, filter: { handler() { - this.page = 1; - this.loadIssues(true); + if (this.$el.tagName) { + this.page = 1; + this.filterLoading = true; + + this.loadIssues(true) + .then(() => { + this.filterLoading = false; + }); + } }, deep: true, }, @@ -139,14 +146,14 @@ require('./empty_state'); :image="blankStateImage" :issue-link-base="issueLinkBase" :root-path="rootPath" - v-if="!loading && showList"></modal-list> + v-if="!loading && showList && !filterLoading"></modal-list> <empty-state v-if="showEmptyState" :image="blankStateImage" :new-issue-path="newIssuePath"></empty-state> <section class="add-issues-list text-center" - v-if="loading"> + v-if="loading || filterLoading"> <div class="add-issues-list-loading"> <i class="fa fa-spinner fa-spin"></i> </div> diff --git a/app/assets/javascripts/boards/stores/modal_store.js b/app/assets/javascripts/boards/stores/modal_store.js index 7ee266a831f..9b009483a3c 100644 --- a/app/assets/javascripts/boards/stores/modal_store.js +++ b/app/assets/javascripts/boards/stores/modal_store.js @@ -15,6 +15,7 @@ searchTerm: '', loading: false, loadingNewPage: false, + filterLoading: false, page: 1, perPage: 50, filter: { |