diff options
author | Luke Bennett <lbennett@gitlab.com> | 2018-12-06 16:41:20 +0300 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-01-03 21:39:36 +0300 |
commit | 5f110a6acff7571126c22013923d3f5d2aab770d (patch) | |
tree | a60fdc9812d72f942ca85698517c0b967f1c09fa /app/assets/javascripts/clusters/clusters_bundle.js | |
parent | 24665ccbe13134bf8379dc68ddfbe80f6c035808 (diff) |
Port GitLab.com gold trial callout changes to CE
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
Diffstat (limited to 'app/assets/javascripts/clusters/clusters_bundle.js')
-rw-r--r-- | app/assets/javascripts/clusters/clusters_bundle.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index cf70a48f076..aff32d95db1 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -1,6 +1,6 @@ import Visibility from 'visibilityjs'; import Vue from 'vue'; -import initDismissableCallout from '~/dismissable_callout'; +import PersistentUserCallout from '../persistent_user_callout'; import { s__, sprintf } from '../locale'; import Flash from '../flash'; import Poll from '../lib/utils/poll'; @@ -67,7 +67,7 @@ export default class Clusters { this.showTokenButton = document.querySelector('.js-show-cluster-token'); this.tokenField = document.querySelector('.js-cluster-token'); - initDismissableCallout('.js-cluster-security-warning'); + Clusters.initDismissableCallout(); initSettingsPanels(); setupToggleButtons(document.querySelector('.js-cluster-enable-toggle-area')); this.initApplications(clusterType); @@ -108,6 +108,12 @@ export default class Clusters { }); } + static initDismissableCallout() { + const callout = document.querySelector('.js-cluster-security-warning'); + + if (callout) new PersistentUserCallout(callout); // eslint-disable-line no-new + } + addListeners() { if (this.showTokenButton) this.showTokenButton.addEventListener('click', this.showToken); eventHub.$on('installApplication', this.installApplication); |