Commit d9588e4d authored by Clement Ho's avatar Clement Ho Committed by Phil Hughes

Remove gitlab-ui's modal from global (EE)

parent 67942eb4
...@@ -2,16 +2,12 @@ import Vue from 'vue'; ...@@ -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);
<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 { ...@@ -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 { ...@@ -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'; ...@@ -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'; ...@@ -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 { ...@@ -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 { ...@@ -237,5 +239,5 @@ export default {
</div> </div>
</div> </div>
</div> </div>
</gl-ui-modal> </gl-modal>
</template> </template>
---
title: Remove gitlab-ui's modal from global
merge_request:
author:
type: performance
...@@ -2,12 +2,17 @@ ...@@ -2,12 +2,17 @@
import { mapActions, mapState, mapGetters } from 'vuex'; import { mapActions, mapState, mapGetters } from 'vuex';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue'; import LoadingButton from '~/vue_shared/components/loading_button.vue';
import { GlModal, GlModalDirective } from '@gitlab-org/gitlab-ui';
import PublishButton from './publish_button.vue'; import PublishButton from './publish_button.vue';
export default { export default {
components: { components: {
PublishButton, PublishButton,
LoadingButton, LoadingButton,
GlModal,
},
directives: {
'gl-modal': GlModalDirective,
}, },
computed: { computed: {
...mapState('batchComments', ['isDiscarding']), ...mapState('batchComments', ['isDiscarding']),
...@@ -42,7 +47,7 @@ export default { ...@@ -42,7 +47,7 @@ export default {
/> />
</p> </p>
</nav> </nav>
<gl-ui-modal <gl-modal
:title="s__('BatchComments|Discard review?')" :title="s__('BatchComments|Discard review?')"
:ok-title="s__('BatchComments|Delete all pending comments')" :ok-title="s__('BatchComments|Delete all pending comments')"
:modal-id="$options.modalId" :modal-id="$options.modalId"
...@@ -52,6 +57,6 @@ export default { ...@@ -52,6 +57,6 @@ export default {
> >
<p v-html="$options.text"> <p v-html="$options.text">
</p> </p>
</gl-ui-modal> </gl-modal>
</div> </div>
</template> </template>
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