Commit da57e99a authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'tz-treeshake-vue-toasted' into 'master'

Moved vue-toasted into status modal

See merge request gitlab-org/gitlab!48476
parents 3021b720 5ba7a2eb
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue'; import Vue from 'vue';
import { GlToast } from '@gitlab/ui';
import Translate from '~/vue_shared/translate'; import Translate from '~/vue_shared/translate';
import { highCountTrim } from '~/lib/utils/text_utility'; import { highCountTrim } from '~/lib/utils/text_utility';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
...@@ -35,7 +34,6 @@ function initStatusTriggers() { ...@@ -35,7 +34,6 @@ function initStatusTriggers() {
const statusModalElement = document.createElement('div'); const statusModalElement = document.createElement('div');
setStatusModalWrapperEl.appendChild(statusModalElement); setStatusModalWrapperEl.appendChild(statusModalElement);
Vue.use(GlToast);
Vue.use(Translate); Vue.use(Translate);
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
......
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue';
import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete'; import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
import { GlModal, GlTooltipDirective, GlIcon, GlFormCheckbox } from '@gitlab/ui'; import { GlToast, GlModal, GlTooltipDirective, GlIcon, GlFormCheckbox } from '@gitlab/ui';
import { deprecatedCreateFlash as createFlash } from '~/flash'; import { deprecatedCreateFlash as createFlash } from '~/flash';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import Api from '~/api'; import Api from '~/api';
...@@ -16,6 +17,8 @@ export const AVAILABILITY_STATUS = { ...@@ -16,6 +17,8 @@ export const AVAILABILITY_STATUS = {
NOT_SET: 'not_set', NOT_SET: 'not_set',
}; };
Vue.use(GlToast);
export default { export default {
components: { components: {
GlIcon, GlIcon,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment