BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6094b306
Commit
6094b306
authored
Mar 17, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show loading icon when changing filter in add issues modal
Closes #29615
parent
f592cae1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
5 deletions
+17
-5
filters.js
app/assets/javascripts/boards/components/modal/filters.js
+1
-1
index.js
app/assets/javascripts/boards/components/modal/index.js
+11
-4
modal_store.js
app/assets/javascripts/boards/stores/modal_store.js
+1
-0
add-issue-modal-loading-indicator.yml
changelogs/unreleased/add-issue-modal-loading-indicator.yml
+4
-0
No files found.
app/assets/javascripts/boards/components/modal/filters.js
View file @
6094b306
...
...
@@ -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
=
''
;
...
...
app/assets/javascripts/boards/components/modal/index.js
View file @
6094b306
...
...
@@ -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>
...
...
app/assets/javascripts/boards/stores/modal_store.js
View file @
6094b306
...
...
@@ -15,6 +15,7 @@
searchTerm
:
''
,
loading
:
false
,
loadingNewPage
:
false
,
filterLoading
:
false
,
page
:
1
,
perPage
:
50
,
filter
:
{
...
...
changelogs/unreleased/add-issue-modal-loading-indicator.yml
0 → 100644
View file @
6094b306
---
title
:
Shows loading icon in issue boards modal when changing filters
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment