Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
9939b613
Commit
9939b613
authored
Aug 16, 2018
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gitlab-org/gitlab-ce#41738' into 'master'
Fix if-check See merge request gitlab-org/gitlab-ce!20640
parents
7a0e2426
c4d2db1f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
app/assets/javascripts/boards/components/board_list.vue
app/assets/javascripts/boards/components/board_list.vue
+1
-1
changelogs/unreleased/41738-fix-sorting-issues-is-wrong-in-list-with-pagination.yml
...8-fix-sorting-issues-is-wrong-in-list-with-pagination.yml
+5
-0
spec/javascripts/boards/board_list_spec.js
spec/javascripts/boards/board_list_spec.js
+9
-0
No files found.
app/assets/javascripts/boards/components/board_list.vue
View file @
9939b613
...
@@ -203,7 +203,7 @@ export default {
...
@@ -203,7 +203,7 @@ export default {
this
.
showIssueForm
=
!
this
.
showIssueForm
;
this
.
showIssueForm
=
!
this
.
showIssueForm
;
},
},
onScroll
()
{
onScroll
()
{
if
(
!
this
.
loadingMore
&&
(
this
.
scrollTop
()
>
this
.
scrollHeight
()
-
this
.
scrollOffset
))
{
if
(
!
this
.
l
ist
.
l
oadingMore
&&
(
this
.
scrollTop
()
>
this
.
scrollHeight
()
-
this
.
scrollOffset
))
{
this
.
loadNextPage
();
this
.
loadNextPage
();
}
}
},
},
...
...
changelogs/unreleased/41738-fix-sorting-issues-is-wrong-in-list-with-pagination.yml
0 → 100644
View file @
9939b613
---
title
:
"
Fix
If-Check
the
result
that
a
function
was
executed
several
times"
merge_request
:
20640
author
:
Max Dicker
type
:
fixed
spec/javascripts/boards/board_list_spec.js
View file @
9939b613
...
@@ -200,6 +200,15 @@ describe('Board list component', () => {
...
@@ -200,6 +200,15 @@ describe('Board list component', () => {
});
});
});
});
it
(
'
does not load issues if already loading
'
,
()
=>
{
component
.
list
.
nextPage
=
spyOn
(
component
.
list
,
'
nextPage
'
).
and
.
returnValue
(
new
Promise
(()
=>
{}));
component
.
onScroll
();
component
.
onScroll
();
expect
(
component
.
list
.
nextPage
).
toHaveBeenCalledTimes
(
1
);
});
it
(
'
shows loading more spinner
'
,
(
done
)
=>
{
it
(
'
shows loading more spinner
'
,
(
done
)
=>
{
component
.
showCount
=
true
;
component
.
showCount
=
true
;
component
.
list
.
loadingMore
=
true
;
component
.
list
.
loadingMore
=
true
;
...
...
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