summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-09 08:34:23 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:17:39 +0100
commit522d53da1de7f42856eff75ed9fee51cd378d953 (patch)
treeb713afd142393891132826b86f24dca20491bc27
parent1cb9de1b634f1bf062a6db9c660d3df4d96cfb2e (diff)
downloadgitlab-ce-522d53da1de7f42856eff75ed9fee51cd378d953.tar.gz
Added some JS improvements
-rw-r--r--app/assets/javascripts/boards/components/board.js.es62
-rw-r--r--app/assets/javascripts/boards/components/board_blank_state.js.es62
-rw-r--r--app/assets/javascripts/boards/components/board_card.js.es62
-rw-r--r--app/assets/javascripts/boards/components/board_delete.js.es62
-rw-r--r--app/assets/javascripts/boards/components/board_list.js.es69
5 files changed, 9 insertions, 8 deletions
diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6
index aa4311f6742..c7cd493bf39 100644
--- a/app/assets/javascripts/boards/components/board.js.es6
+++ b/app/assets/javascripts/boards/components/board.js.es6
@@ -1,4 +1,4 @@
-(() => {
+(function () {
const Board = Vue.extend({
props: {
list: Object,
diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6
index 61cf3282c02..4b0b5be0317 100644
--- a/app/assets/javascripts/boards/components/board_blank_state.js.es6
+++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6
@@ -1,4 +1,4 @@
-(() => {
+(function () {
const BoardBlankState = Vue.extend({
methods: {
addDefaultLists: function () {
diff --git a/app/assets/javascripts/boards/components/board_card.js.es6 b/app/assets/javascripts/boards/components/board_card.js.es6
index 14191cb881b..0b7ac62892e 100644
--- a/app/assets/javascripts/boards/components/board_card.js.es6
+++ b/app/assets/javascripts/boards/components/board_card.js.es6
@@ -1,4 +1,4 @@
-(() => {
+(function () {
const BoardCard = Vue.extend({
props: {
issue: Object,
diff --git a/app/assets/javascripts/boards/components/board_delete.js.es6 b/app/assets/javascripts/boards/components/board_delete.js.es6
index 958d85cd326..4b21db69b32 100644
--- a/app/assets/javascripts/boards/components/board_delete.js.es6
+++ b/app/assets/javascripts/boards/components/board_delete.js.es6
@@ -5,7 +5,7 @@
},
methods: {
deleteBoard: function () {
- $(this.$el).tooltip('destroy');
+ $(this.$el).tooltip('hide');
if (confirm('Are you sure you want to delete this list?')) {
this.list.destroy();
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index 7d0cca6a88a..c09b7777c33 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -1,4 +1,4 @@
-(() => {
+(function () {
const BoardList = Vue.extend({
props: {
disabled: Boolean,
@@ -50,12 +50,13 @@
group: 'issues',
disabled: this.disabled,
onAdd: (e) => {
- const fromListId = parseInt(e.from.getAttribute('data-board')),
+ const card = e.item,
+ fromListId = parseInt(e.from.getAttribute('data-board')),
toListId = parseInt(e.to.getAttribute('data-board')),
- issueId = parseInt(e.item.getAttribute('data-issue'));
+ issueId = parseInt(card.getAttribute('data-issue'));
// Remove the new dom element & let vue add the element
- e.item.parentNode.removeChild(e.item);
+ card.parentNode.removeChild(card);
BoardsStore.moveCardToList(fromListId, toListId, issueId);
}