summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/integrations
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-10-02 13:32:53 +0100
committerPhil Hughes <me@iamphill.com>2017-10-10 10:14:22 +0100
commitfa2af5e0f5e290eff32f62c7ea9f935a6ad33967 (patch)
tree539846b44a1e8e5c0c3117bf71455c6131c135d1 /app/assets/javascripts/integrations
parent99806914a5ca382b22588de722a0db1c7a8bfff6 (diff)
downloadgitlab-ce-fa2af5e0f5e290eff32f62c7ea9f935a6ad33967.tar.gz
Flash is now a ES6 module
Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
Diffstat (limited to 'app/assets/javascripts/integrations')
-rw-r--r--app/assets/javascripts/integrations/integration_settings_form.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/integrations/integration_settings_form.js b/app/assets/javascripts/integrations/integration_settings_form.js
index cf1e6a14725..32415a8791f 100644
--- a/app/assets/javascripts/integrations/integration_settings_form.js
+++ b/app/assets/javascripts/integrations/integration_settings_form.js
@@ -1,4 +1,4 @@
-/* global Flash */
+import Flash from '../flash';
export default class IntegrationSettingsForm {
constructor(formSelector) {
@@ -102,7 +102,7 @@ export default class IntegrationSettingsForm {
})
.done((res) => {
if (res.error) {
- new Flash(`${res.message} ${res.service_response}`, null, null, {
+ new Flash(`${res.message} ${res.service_response}`, 'alert', document, {
title: 'Save anyway',
clickHandler: (e) => {
e.preventDefault();