summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-07 20:34:19 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-07 14:57:00 +0100
commit421e41c9ce3abdd843079c1eb022cad8974d36ff (patch)
tree495149c4fd99d811e31bae9e2d775954764a04fa /app/assets/javascripts
parentfa82736cf4ba55c0f549f137afd2abe8383e33f8 (diff)
downloadgitlab-ce-421e41c9ce3abdd843079c1eb022cad8974d36ff.tar.gz
Added specs
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/close_reopen_report_toggle.js8
-rw-r--r--app/assets/javascripts/issue.js4
-rw-r--r--app/assets/javascripts/merge_request.js7
3 files changed, 11 insertions, 8 deletions
diff --git a/app/assets/javascripts/close_reopen_report_toggle.js b/app/assets/javascripts/close_reopen_report_toggle.js
index e56ae598092..0824f124984 100644
--- a/app/assets/javascripts/close_reopen_report_toggle.js
+++ b/app/assets/javascripts/close_reopen_report_toggle.js
@@ -1,4 +1,4 @@
-import DropLab from './droplab/drop_lab';
+import * as DropLab from './droplab/drop_lab';
import ISetter from './droplab/plugins/input_setter';
// Todo: Remove this when fixing issue in input_setter plugin
@@ -9,13 +9,13 @@ class CloseReopenReportToggle {
this.dropdownTrigger = opts.dropdownTrigger;
this.dropdownList = opts.dropdownList;
this.button = opts.button;
+ }
+ initDroplab() {
this.reopenItem = this.dropdownList.querySelector('.reopen-item');
this.closeItem = this.dropdownList.querySelector('.close-item');
- }
- initDroplab() {
- this.droplab = new DropLab();
+ this.droplab = new DropLab.default();
const config = this.setConfig();
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js
index 62ffde6c93c..b61570e88e0 100644
--- a/app/assets/javascripts/issue.js
+++ b/app/assets/javascripts/issue.js
@@ -6,7 +6,7 @@ import '~/lib/utils/text_utility';
import './flash';
import './task_list';
import CreateMergeRequestDropdown from './create_merge_request_dropdown';
-import CloseReopenReportToggle from './close_reopen_report_toggle';
+import * as CloseReopenReportToggle from './close_reopen_report_toggle';
class Issue {
constructor() {
@@ -98,7 +98,7 @@ class Issue {
const dropdownList = container.querySelector('.js-issuable-close-menu');
const button = container.querySelector('.js-issuable-close-button');
- this.closeReopenReportToggle = new CloseReopenReportToggle({
+ this.closeReopenReportToggle = new CloseReopenReportToggle.default({
dropdownTrigger,
dropdownList,
button,
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index c00978bfaea..eebf45aa581 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -4,7 +4,7 @@
import 'vendor/jquery.waitforimages';
import './task_list';
import './merge_request_tabs';
-import CloseReopenReportToggle from './close_reopen_report_toggle';
+import * as CloseReopenReportToggle from './close_reopen_report_toggle';
(function() {
this.MergeRequest = (function() {
@@ -123,11 +123,14 @@ import CloseReopenReportToggle from './close_reopen_report_toggle';
MergeRequest.initCloseReopenReport = function () {
const container = document.querySelector('.js-issuable-close-dropdown');
+
+ if (!container) return;
+
const dropdownTrigger = container.querySelector('.js-issuable-close-toggle');
const dropdownList = container.querySelector('.js-issuable-close-menu');
const button = container.querySelector('.js-issuable-close-button');
- const closeReopenReportToggle = new CloseReopenReportToggle({
+ const closeReopenReportToggle = new CloseReopenReportToggle.default({
dropdownTrigger,
dropdownList,
button,