summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-01-26 15:49:49 +0100
committerFatih Acet <acetfatih@gmail.com>2019-01-30 23:18:19 +0100
commit992fcf6c87721405be59d2a22da7d21157e17f45 (patch)
tree0fe46a861b647356a605aa8a76d1d07b679a1065 /app/assets/javascripts
parentf00c6db83f1f8b0bbb35230cfede0cfddfc9f7da (diff)
downloadgitlab-ce-992fcf6c87721405be59d2a22da7d21157e17f45.tar.gz
Add missing specs.
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/issue_show/components/description.vue8
-rw-r--r--app/assets/javascripts/task_list.js9
2 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue
index 56e873c6ba0..f42787a7147 100644
--- a/app/assets/javascripts/issue_show/components/description.vue
+++ b/app/assets/javascripts/issue_show/components/description.vue
@@ -1,6 +1,6 @@
<script>
import $ from 'jquery';
-import createFlash from '~/flash';
+import { __ } from '~/locale';
import animateMixin from '../mixins/animate';
import TaskList from '../../task_list';
import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor';
@@ -91,8 +91,10 @@ export default {
},
taskListUpdateError() {
- createFlash(
- 'Someone edited this issue at the same time you did and we updated the issue description.',
+ window.Flash(
+ __(
+ 'Someone edited this issue at the same time you did and we updated the issue description.',
+ ),
);
this.$emit('taskListUpdateFailed');
diff --git a/app/assets/javascripts/task_list.js b/app/assets/javascripts/task_list.js
index c3932db7be2..161c44fa156 100644
--- a/app/assets/javascripts/task_list.js
+++ b/app/assets/javascripts/task_list.js
@@ -9,8 +9,9 @@ export default class TaskList {
this.dataType = options.dataType;
this.fieldName = options.fieldName;
this.lockVersion = options.lockVersion;
- this.onSuccess = options.onSuccess || (() => {});
this.taskListContainerSelector = `${this.selector} .js-task-list-container`;
+ this.updateHandler = this.update.bind(this);
+ this.onSuccess = options.onSuccess || (() => {});
this.onError =
options.onError ||
function showFlash(e) {
@@ -27,10 +28,10 @@ export default class TaskList {
}
init() {
- // Prevent duplicate event bindings
- this.disable();
+ this.disable(); // Prevent duplicate event bindings
+
$(this.taskListContainerSelector).taskList('enable');
- $(document).on('tasklist:changed', this.taskListContainerSelector, this.update.bind(this));
+ $(document).on('tasklist:changed', this.taskListContainerSelector, this.updateHandler);
}
getTaskListTarget(e = {}) {