diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/assets/javascripts/vue_shared/components/web_ide_link.vue | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/web_ide_link.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/web_ide_link.vue | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/components/web_ide_link.vue b/app/assets/javascripts/vue_shared/components/web_ide_link.vue index f02cd5c4e2e..82022d1f4d6 100644 --- a/app/assets/javascripts/vue_shared/components/web_ide_link.vue +++ b/app/assets/javascripts/vue_shared/components/web_ide_link.vue @@ -1,9 +1,9 @@ <script> -import $ from 'jquery'; import { GlModal, GlSprintf, GlLink } from '@gitlab/ui'; import { s__, __ } from '~/locale'; import ActionsButton from '~/vue_shared/components/actions_button.vue'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; +import ConfirmForkModal from '~/vue_shared/components/confirm_fork_modal.vue'; const KEY_EDIT = 'edit'; const KEY_WEB_IDE = 'webide'; @@ -16,6 +16,7 @@ export default { GlModal, GlSprintf, GlLink, + ConfirmForkModal, }, i18n: { modal: { @@ -103,11 +104,22 @@ export default { required: false, default: false, }, + forkPath: { + type: String, + required: false, + default: '', + }, + forkModalId: { + type: String, + required: false, + default: '', + }, }, data() { return { selection: KEY_WEB_IDE, showEnableGitpodModal: false, + showForkModal: false, }; }, computed: { @@ -128,7 +140,7 @@ export default { return; } - this.showJQueryModal('#modal-confirm-fork-edit'); + this.showModal('showForkModal'); }, } : { href: this.editUrl }; @@ -171,7 +183,7 @@ export default { return; } - this.showJQueryModal('#modal-confirm-fork-webide'); + this.showModal('showForkModal'); }, } : { href: this.webIdeUrl }; @@ -247,9 +259,6 @@ export default { select(key) { this.selection = key; }, - showJQueryModal(id) { - $(id).modal('show'); - }, showModal(dataKey) { this[dataKey] = true; }, @@ -282,5 +291,11 @@ export default { </template> </gl-sprintf> </gl-modal> + <confirm-fork-modal + v-if="showWebIdeButton || showEditButton" + v-model="showForkModal" + :modal-id="forkModalId" + :fork-path="forkPath" + /> </div> </template> |