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
Léo-Paul Géneau
gitlab-ce
Commits
abb55af2
Commit
abb55af2
authored
Aug 15, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed blank state issue
Updated some parts based on feedback
parent
5c7fd643
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
10 deletions
+18
-10
app/assets/javascripts/boards/components/board.js.es6
app/assets/javascripts/boards/components/board.js.es6
+9
-4
app/assets/javascripts/boards/components/board_blank_state.js.es6
...ts/javascripts/boards/components/board_blank_state.js.es6
+2
-1
app/assets/javascripts/boards/components/board_card.js.es6
app/assets/javascripts/boards/components/board_card.js.es6
+2
-2
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+5
-3
No files found.
app/assets/javascripts/boards/components/board.js.es6
View file @
abb55af2
...
...
@@ -31,9 +31,11 @@
this.query = '';
},
getFilterData () {
if (!this.list.canSearch()) return this.filters;
const filters = this.filters;
let queryData =
this.list.canSearch() ? { search: this.query } : {
};
let queryData =
{ search: this.query
};
Object.keys(filters).forEach((key) => { queryData[key] = filters[key]; });
return queryData;
...
...
@@ -41,7 +43,7 @@
},
computed: {
isPreset () {
return
this.list.type === 'backlog' || this.list.type === 'done' || this.list.type === 'blank'
;
return
['backlog', 'done', 'blank'].indexOf(this.list.type) > -1
;
}
},
ready () {
...
...
@@ -59,7 +61,10 @@
options.handle = '.js-board-drag-handle';
}
Sortable.create(this.$el.parentNode, options);
this.sortable = Sortable.create(this.$el.parentNode, options);
},
beforeDestroy () {
this.sortable.destroy();
}
});
...
...
app/assets/javascripts/boards/components/board_blank_state.js.es6
View file @
abb55af2
...
...
@@ -20,7 +20,7 @@
BoardsStore.addList({
title: label.title,
position: i,
type: 'label',
list_
type: 'label',
label: {
title: label.title,
color: label.color
...
...
@@ -37,6 +37,7 @@
for (let i = 0, dataLength = data.length; i < dataLength; i++) {
const listObj = data[i],
list = BoardsStore.findList('title', listObj.title);
list.id = listObj.id;
list.label.id = listObj.label.id;
list.getIssues();
...
...
app/assets/javascripts/boards/components/board_card.js.es6
View file @
abb55af2
...
...
@@ -7,10 +7,10 @@
disabled: Boolean
},
methods: {
filterByLabel (label,
$event
) {
filterByLabel (label,
e
) {
let labelToggleText = label.title;
const labelIndex = BoardsStore.state.filters['label_name'].indexOf(label.title);
$(
$event
.target).tooltip('hide');
$(
e
.target).tooltip('hide');
if (labelIndex === -1) {
BoardsStore.state.filters['label_name'].push(label.title);
...
...
app/assets/javascripts/boards/components/board_list.js.es6
View file @
abb55af2
...
...
@@ -44,8 +44,7 @@
},
},
ready () {
const list = this.list,
options = gl.getBoardSortableDefaultOptions({
const options = gl.getBoardSortableDefaultOptions({
group: 'issues',
sort: false,
disabled: this.disabled,
...
...
@@ -66,7 +65,7 @@
options.handle = '.js-card-drag-handle';
}
Sortable.create(this.$els.list, options);
this.sortable =
Sortable.create(this.$els.list, options);
// Scroll event on list to load more
this.$els.list.onscroll = () => {
...
...
@@ -74,6 +73,9 @@
this.loadNextPage();
}
};
},
beforeDestroy () {
this.sortable.destroy();
}
});
...
...
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