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
87ee18c9
Commit
87ee18c9
authored
Feb 02, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move BoardList vue component to vue file
parent
b9d547b1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
87 deletions
+97
-87
app/assets/javascripts/boards/components/board.js
app/assets/javascripts/boards/components/board.js
+1
-1
app/assets/javascripts/boards/components/board_list.vue
app/assets/javascripts/boards/components/board_list.vue
+90
-85
changelogs/unreleased/move-board-list-vue-component.yml
changelogs/unreleased/move-board-list-vue-component.yml
+5
-0
spec/javascripts/boards/board_list_spec.js
spec/javascripts/boards/board_list_spec.js
+1
-1
No files found.
app/assets/javascripts/boards/components/board.js
View file @
87ee18c9
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
import
Sortable
from
'
vendor/Sortable
'
;
import
Sortable
from
'
vendor/Sortable
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
AccessorUtilities
from
'
../../lib/utils/accessor
'
;
import
AccessorUtilities
from
'
../../lib/utils/accessor
'
;
import
boardList
from
'
./board_list
'
;
import
boardList
from
'
./board_list
.vue
'
;
import
boardBlankState
from
'
./board_blank_state
'
;
import
boardBlankState
from
'
./board_blank_state
'
;
import
'
./board_delete
'
;
import
'
./board_delete
'
;
...
...
app/assets/javascripts/boards/components/board_list.
js
→
app/assets/javascripts/boards/components/board_list.
vue
View file @
87ee18c9
<
script
>
import
Sortable
from
'
vendor/Sortable
'
;
import
Sortable
from
'
vendor/Sortable
'
;
import
boardNewIssue
from
'
./board_new_issue
'
;
import
boardNewIssue
from
'
./board_new_issue
'
;
import
boardCard
from
'
./board_card.vue
'
;
import
boardCard
from
'
./board_card.vue
'
;
...
@@ -8,6 +9,11 @@ const Store = gl.issueBoards.BoardsStore;
...
@@ -8,6 +9,11 @@ const Store = gl.issueBoards.BoardsStore;
export
default
{
export
default
{
name
:
'
BoardList
'
,
name
:
'
BoardList
'
,
components
:
{
boardCard
,
boardNewIssue
,
loadingIcon
,
},
props
:
{
props
:
{
disabled
:
{
disabled
:
{
type
:
Boolean
,
type
:
Boolean
,
...
@@ -42,46 +48,6 @@ export default {
...
@@ -42,46 +48,6 @@ export default {
showIssueForm
:
false
,
showIssueForm
:
false
,
};
};
},
},
components
:
{
boardCard
,
boardNewIssue
,
loadingIcon
,
},
methods
:
{
listHeight
()
{
return
this
.
$refs
.
list
.
getBoundingClientRect
().
height
;
},
scrollHeight
()
{
return
this
.
$refs
.
list
.
scrollHeight
;
},
scrollTop
()
{
return
this
.
$refs
.
list
.
scrollTop
+
this
.
listHeight
();
},
scrollToTop
()
{
this
.
$refs
.
list
.
scrollTop
=
0
;
},
loadNextPage
()
{
const
getIssues
=
this
.
list
.
nextPage
();
const
loadingDone
=
()
=>
{
this
.
list
.
loadingMore
=
false
;
};
if
(
getIssues
)
{
this
.
list
.
loadingMore
=
true
;
getIssues
.
then
(
loadingDone
)
.
catch
(
loadingDone
);
}
},
toggleForm
()
{
this
.
showIssueForm
=
!
this
.
showIssueForm
;
},
onScroll
()
{
if
(
!
this
.
loadingMore
&&
(
this
.
scrollTop
()
>
this
.
scrollHeight
()
-
this
.
scrollOffset
))
{
this
.
loadNextPage
();
}
},
},
watch
:
{
watch
:
{
filters
:
{
filters
:
{
handler
()
{
handler
()
{
...
@@ -157,7 +123,45 @@ export default {
...
@@ -157,7 +123,45 @@ export default {
eventHub
.
$off
(
`scroll-board-list-
${
this
.
list
.
id
}
`
,
this
.
scrollToTop
);
eventHub
.
$off
(
`scroll-board-list-
${
this
.
list
.
id
}
`
,
this
.
scrollToTop
);
this
.
$refs
.
list
.
removeEventListener
(
'
scroll
'
,
this
.
onScroll
);
this
.
$refs
.
list
.
removeEventListener
(
'
scroll
'
,
this
.
onScroll
);
},
},
template
:
`
methods
:
{
listHeight
()
{
return
this
.
$refs
.
list
.
getBoundingClientRect
().
height
;
},
scrollHeight
()
{
return
this
.
$refs
.
list
.
scrollHeight
;
},
scrollTop
()
{
return
this
.
$refs
.
list
.
scrollTop
+
this
.
listHeight
();
},
scrollToTop
()
{
this
.
$refs
.
list
.
scrollTop
=
0
;
},
loadNextPage
()
{
const
getIssues
=
this
.
list
.
nextPage
();
const
loadingDone
=
()
=>
{
this
.
list
.
loadingMore
=
false
;
};
if
(
getIssues
)
{
this
.
list
.
loadingMore
=
true
;
getIssues
.
then
(
loadingDone
)
.
catch
(
loadingDone
);
}
},
toggleForm
()
{
this
.
showIssueForm
=
!
this
.
showIssueForm
;
},
onScroll
()
{
if
(
!
this
.
loadingMore
&&
(
this
.
scrollTop
()
>
this
.
scrollHeight
()
-
this
.
scrollOffset
))
{
this
.
loadNextPage
();
}
},
},
};
</
script
>
<
template
>
<div
class=
"board-list-component"
>
<div
class=
"board-list-component"
>
<div
<div
class=
"board-list-loading text-center"
class=
"board-list-loading text-center"
...
@@ -188,20 +192,21 @@ export default {
...
@@ -188,20 +192,21 @@ export default {
class=
"board-list-count text-center"
class=
"board-list-count text-center"
v-if=
"showCount"
v-if=
"showCount"
data-issue-id=
"-1"
>
data-issue-id=
"-1"
>
<loading-icon
<loading-icon
v-show=
"list.loadingMore"
v-show=
"list.loadingMore"
label=
"Loading more issues"
label=
"Loading more issues"
/>
/>
<span
<span v-if="list.issues.length === list.issuesSize">
v-if=
"list.issues.length === list.issuesSize"
>
Showing all issues
Showing all issues
</span>
</span>
<span v-else>
<span
v-else
>
Showing
{{
list
.
issues
.
length
}}
of
{{
list
.
issuesSize
}}
issues
Showing
{{
list
.
issues
.
length
}}
of
{{
list
.
issuesSize
}}
issues
</span>
</span>
</li>
</li>
</ul>
</ul>
</div>
</div>
`
,
</
template
>
};
changelogs/unreleased/move-board-list-vue-component.yml
0 → 100644
View file @
87ee18c9
---
title
:
Move BoardList vue component to vue file
merge_request
:
16888
author
:
George Tsiolis
type
:
performance
spec/javascripts/boards/board_list_spec.js
View file @
87ee18c9
...
@@ -5,7 +5,7 @@ import Vue from 'vue';
...
@@ -5,7 +5,7 @@ import Vue from 'vue';
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
Sortable
from
'
vendor/Sortable
'
;
import
Sortable
from
'
vendor/Sortable
'
;
import
BoardList
from
'
~/boards/components/board_list
'
;
import
BoardList
from
'
~/boards/components/board_list
.vue
'
;
import
eventHub
from
'
~/boards/eventhub
'
;
import
eventHub
from
'
~/boards/eventhub
'
;
import
'
~/boards/mixins/sortable_default_options
'
;
import
'
~/boards/mixins/sortable_default_options
'
;
import
'
~/boards/models/issue
'
;
import
'
~/boards/models/issue
'
;
...
...
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