Remove gitlab-ui's modal from global
This commit is contained in:
parent
8c57cb3951
commit
779c90d1d2
|
@ -2,16 +2,12 @@ import Vue from 'vue';
|
||||||
import {
|
import {
|
||||||
GlPagination,
|
GlPagination,
|
||||||
GlProgressBar,
|
GlProgressBar,
|
||||||
GlModal,
|
|
||||||
GlLoadingIcon,
|
GlLoadingIcon,
|
||||||
GlModalDirective,
|
|
||||||
GlTooltipDirective,
|
GlTooltipDirective,
|
||||||
} from '@gitlab-org/gitlab-ui';
|
} from '@gitlab-org/gitlab-ui';
|
||||||
|
|
||||||
Vue.component('gl-pagination', GlPagination);
|
Vue.component('gl-pagination', GlPagination);
|
||||||
Vue.component('gl-progress-bar', GlProgressBar);
|
Vue.component('gl-progress-bar', GlProgressBar);
|
||||||
Vue.component('gl-ui-modal', GlModal);
|
|
||||||
Vue.component('gl-loading-icon', GlLoadingIcon);
|
Vue.component('gl-loading-icon', GlLoadingIcon);
|
||||||
|
|
||||||
Vue.directive('gl-modal', GlModalDirective);
|
|
||||||
Vue.directive('gl-tooltip', GlTooltipDirective);
|
Vue.directive('gl-tooltip', GlTooltipDirective);
|
||||||
|
|
|
@ -1,8 +1,15 @@
|
||||||
<script>
|
<script>
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
import { s__, sprintf } from '~/locale';
|
import { s__, sprintf } from '~/locale';
|
||||||
|
import { GlModal, GlModalDirective } from '@gitlab-org/gitlab-ui';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
components: {
|
||||||
|
GlModal,
|
||||||
|
},
|
||||||
|
directives: {
|
||||||
|
'gl-modal': GlModalDirective,
|
||||||
|
},
|
||||||
props: {
|
props: {
|
||||||
deleteWikiUrl: {
|
deleteWikiUrl: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -54,7 +61,7 @@ export default {
|
||||||
>
|
>
|
||||||
{{ __('Delete') }}
|
{{ __('Delete') }}
|
||||||
</button>
|
</button>
|
||||||
<gl-ui-modal
|
<gl-modal
|
||||||
:title="title"
|
:title="title"
|
||||||
:ok-title="s__('WikiPageConfirmDelete|Delete page')"
|
:ok-title="s__('WikiPageConfirmDelete|Delete page')"
|
||||||
:modal-id="modalId"
|
:modal-id="modalId"
|
||||||
|
@ -81,6 +88,6 @@ export default {
|
||||||
name="authenticity_token"
|
name="authenticity_token"
|
||||||
/>
|
/>
|
||||||
</form>
|
</form>
|
||||||
</gl-ui-modal>
|
</gl-modal>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
|
||||||
import GfmAutoComplete from '~/gfm_auto_complete';
|
import GfmAutoComplete from '~/gfm_auto_complete';
|
||||||
import { __, s__ } from '~/locale';
|
import { __, s__ } from '~/locale';
|
||||||
import Api from '~/api';
|
import Api from '~/api';
|
||||||
|
import { GlModal } from '@gitlab-org/gitlab-ui';
|
||||||
import eventHub from './event_hub';
|
import eventHub from './event_hub';
|
||||||
import EmojiMenuInModal from './emoji_menu_in_modal';
|
import EmojiMenuInModal from './emoji_menu_in_modal';
|
||||||
|
|
||||||
|
@ -13,6 +14,7 @@ const emojiMenuClass = 'js-modal-status-emoji-menu';
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
Icon,
|
Icon,
|
||||||
|
GlModal,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
currentEmoji: {
|
currentEmoji: {
|
||||||
|
@ -152,7 +154,7 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<gl-ui-modal
|
<gl-modal
|
||||||
:title="s__('SetStatusModal|Set a status')"
|
:title="s__('SetStatusModal|Set a status')"
|
||||||
:modal-id="modalId"
|
:modal-id="modalId"
|
||||||
:ok-title="s__('SetStatusModal|Set status')"
|
:ok-title="s__('SetStatusModal|Set status')"
|
||||||
|
@ -237,5 +239,5 @@ export default {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</gl-ui-modal>
|
</gl-modal>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Remove gitlab-ui's modal from global
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: performance
|
Loading…
Reference in New Issue