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
Jérome Perrin
gitlab-ce
Commits
99b421da
Commit
99b421da
authored
Nov 03, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate Vue v1 to v2.
parent
a51285ad
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
21 deletions
+23
-21
app/assets/javascripts/boards/boards_bundle.js.es6
app/assets/javascripts/boards/boards_bundle.js.es6
+2
-2
app/assets/javascripts/boards/components/board.js.es6
app/assets/javascripts/boards/components/board.js.es6
+3
-2
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+7
-7
app/assets/javascripts/boards/components/board_new_issue.js.es6
...sets/javascripts/boards/components/board_new_issue.js.es6
+3
-3
app/assets/javascripts/boards/components/board_sidebar.js.es6
...assets/javascripts/boards/components/board_sidebar.js.es6
+1
-1
app/assets/javascripts/boards/models/list.js.es6
app/assets/javascripts/boards/models/list.js.es6
+2
-1
app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
...ascripts/diff_notes/components/comment_resolve_btn.js.es6
+1
-1
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
...sets/javascripts/diff_notes/components/resolve_btn.js.es6
+3
-3
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
...cripts/merge_conflicts/components/diff_file_editor.js.es6
+1
-1
No files found.
app/assets/javascripts/boards/boards_bundle.js.es6
View file @
99b421da
...
@@ -37,7 +37,7 @@ $(() => {
...
@@ -37,7 +37,7 @@ $(() => {
issueLinkBase: $boardApp.dataset.issueLinkBase,
issueLinkBase: $boardApp.dataset.issueLinkBase,
detailIssue: Store.detail
detailIssue: Store.detail
},
},
init
: Store.create.bind(Store),
beforeCreate
: Store.create.bind(Store),
computed: {
computed: {
detailIssueVisible () {
detailIssueVisible () {
return Object.keys(this.detailIssue.issue).length;
return Object.keys(this.detailIssue.issue).length;
...
@@ -46,7 +46,7 @@ $(() => {
...
@@ -46,7 +46,7 @@ $(() => {
created () {
created () {
gl.boardService = new BoardService(this.endpoint, this.boardId);
gl.boardService = new BoardService(this.endpoint, this.boardId);
},
},
ready
() {
mounted
() {
Store.disabled = this.disabled;
Store.disabled = this.disabled;
gl.boardService.all()
gl.boardService.all()
.then((resp) => {
.then((resp) => {
...
...
app/assets/javascripts/boards/components/board.js.es6
View file @
99b421da
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
this.showIssueForm = !this.showIssueForm;
this.showIssueForm = !this.showIssueForm;
}
}
},
},
ready
() {
mounted
() {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
const options = gl.issueBoards.getBoardSortableDefaultOptions({
disabled: this.disabled,
disabled: this.disabled,
group: 'boards',
group: 'boards',
...
@@ -88,7 +88,8 @@
...
@@ -88,7 +88,8 @@
this.sortable = Sortable.create(this.$el.parentNode, options);
this.sortable = Sortable.create(this.$el.parentNode, options);
},
},
beforeDestroy () {
beforeDestroy () {
Store.state.lists.$remove(this.list);
const index = Store.state.lists.indexOf(this.list);
Store.state.lists.splice(index, 1);
}
}
});
});
})();
})();
app/assets/javascripts/boards/components/board_list.js.es6
View file @
99b421da
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
filters: {
filters: {
handler () {
handler () {
this.list.loadingMore = false;
this.list.loadingMore = false;
this.$
el
s.list.scrollTop = 0;
this.$
ref
s.list.scrollTop = 0;
},
},
deep: true
deep: true
},
},
...
@@ -53,13 +53,13 @@
...
@@ -53,13 +53,13 @@
},
},
methods: {
methods: {
listHeight () {
listHeight () {
return this.$
el
s.list.getBoundingClientRect().height;
return this.$
ref
s.list.getBoundingClientRect().height;
},
},
scrollHeight () {
scrollHeight () {
return this.$
el
s.list.scrollHeight;
return this.$
ref
s.list.scrollHeight;
},
},
scrollTop () {
scrollTop () {
return this.$
el
s.list.scrollTop + this.listHeight();
return this.$
ref
s.list.scrollTop + this.listHeight();
},
},
loadNextPage () {
loadNextPage () {
const getIssues = this.list.nextPage();
const getIssues = this.list.nextPage();
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
}
}
},
},
},
},
ready
() {
mounted
() {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
const options = gl.issueBoards.getBoardSortableDefaultOptions({
group: 'issues',
group: 'issues',
sort: false,
sort: false,
...
@@ -94,10 +94,10 @@
...
@@ -94,10 +94,10 @@
}
}
});
});
this.sortable = Sortable.create(this.$
el
s.list, options);
this.sortable = Sortable.create(this.$
ref
s.list, options);
// Scroll event on list to load more
// Scroll event on list to load more
this.$
el
s.list.onscroll = () => {
this.$
ref
s.list.onscroll = () => {
if ((this.scrollTop() > this.scrollHeight() - this.scrollOffset) && !this.list.loadingMore) {
if ((this.scrollTop() > this.scrollHeight() - this.scrollOffset) && !this.list.loadingMore) {
this.loadNextPage();
this.loadNextPage();
}
}
...
...
app/assets/javascripts/boards/components/board_new_issue.js.es6
View file @
99b421da
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
},
},
watch: {
watch: {
showIssueForm () {
showIssueForm () {
this.$
el
s.input.focus();
this.$
ref
s.input.focus();
}
}
},
},
methods: {
methods: {
...
@@ -37,13 +37,13 @@
...
@@ -37,13 +37,13 @@
this.list.newIssue(issue)
this.list.newIssue(issue)
.then((data) => {
.then((data) => {
// Need this because our jQuery very kindly disables buttons on ALL form submissions
// Need this because our jQuery very kindly disables buttons on ALL form submissions
$(this.$
el
s.submitButton).enable();
$(this.$
ref
s.submitButton).enable();
Store.detail.issue = issue;
Store.detail.issue = issue;
})
})
.catch(() => {
.catch(() => {
// Need this because our jQuery very kindly disables buttons on ALL form submissions
// Need this because our jQuery very kindly disables buttons on ALL form submissions
$(this.$
el
s.submitButton).enable();
$(this.$
ref
s.submitButton).enable();
// Remove the issue
// Remove the issue
this.list.removeIssue(issue);
this.list.removeIssue(issue);
...
...
app/assets/javascripts/boards/components/board_sidebar.js.es6
View file @
99b421da
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
this.detail.issue = {};
this.detail.issue = {};
}
}
},
},
ready
() {
mounted
() {
new IssuableContext(this.currentUser);
new IssuableContext(this.currentUser);
new MilestoneSelect();
new MilestoneSelect();
new gl.DueDateSelectors();
new gl.DueDateSelectors();
...
...
app/assets/javascripts/boards/models/list.js.es6
View file @
99b421da
...
@@ -42,7 +42,8 @@ class List {
...
@@ -42,7 +42,8 @@ class List {
}
}
destroy () {
destroy () {
gl.issueBoards.BoardsStore.state.lists.$remove(this);
const index = gl.issueBoards.BoardsStore.state.lists.indexOf(this);
gl.issueBoards.BoardsStore.state.lists.splice(index, 1);
gl.issueBoards.BoardsStore.updateNewListDropdown(this.id);
gl.issueBoards.BoardsStore.updateNewListDropdown(this.id);
gl.boardService.destroyList(this.id);
gl.boardService.destroyList(this.id);
...
...
app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
View file @
99b421da
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
}
}
}
}
},
},
ready
: function () {
mounted
: function () {
const $textarea = $(`#new-discussion-note-form-${this.discussionId} .note-textarea`);
const $textarea = $(`#new-discussion-note-form-${this.discussionId} .note-textarea`);
this.textareaIsEmpty = $textarea.val() === '';
this.textareaIsEmpty = $textarea.val() === '';
...
...
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
View file @
99b421da
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
},
},
methods: {
methods: {
updateTooltip: function () {
updateTooltip: function () {
$(this.$
el
s.button)
$(this.$
ref
s.button)
.tooltip('hide')
.tooltip('hide')
.tooltip('fixTitle');
.tooltip('fixTitle');
},
},
...
@@ -89,8 +89,8 @@
...
@@ -89,8 +89,8 @@
});
});
}
}
},
},
compil
ed: function () {
mount
ed: function () {
$(this.$
el
s.button).tooltip({
$(this.$
ref
s.button).tooltip({
container: 'body'
container: 'body'
});
});
},
},
...
...
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
View file @
99b421da
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
this.loadEditor();
this.loadEditor();
}
}
},
},
ready
() {
mounted
() {
if (this.file.loadEditor) {
if (this.file.loadEditor) {
this.loadEditor();
this.loadEditor();
}
}
...
...
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