diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-03 10:00:48 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-03 10:00:48 +0000 |
commit | b901df220c9411eba4f541ac91b3e275a0dfa1df (patch) | |
tree | 5a295fe884ed9a2199eba6dadd089739e5f149be /app/assets/javascripts/vue_shared | |
parent | 972854078bb9d02f857ed95bea1cc3c98c039d2e (diff) | |
parent | 19eecd01fada302afe814a485172d699c96d44e8 (diff) | |
download | gitlab-ce-b901df220c9411eba4f541ac91b3e275a0dfa1df.tar.gz |
Merge branch 'ide-rename-files' into 'master'
Enable renaming files & folders in the Web IDE
Closes #44845
See merge request gitlab-org/gitlab-ce!20835
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/gl_modal.vue | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/gl_modal.vue b/app/assets/javascripts/vue_shared/components/gl_modal.vue index 416eda796a7..b023c5cfeb1 100644 --- a/app/assets/javascripts/vue_shared/components/gl_modal.vue +++ b/app/assets/javascripts/vue_shared/components/gl_modal.vue @@ -1,4 +1,6 @@ <script> +import $ from 'jquery'; + const buttonVariants = ['danger', 'primary', 'success', 'warning']; const sizeVariants = ['sm', 'md', 'lg', 'xl']; @@ -38,6 +40,12 @@ export default { return this.modalSize === 'md' ? '' : `modal-${this.modalSize}`; }, }, + mounted() { + $(this.$el).on('shown.bs.modal', this.opened).on('hidden.bs.modal', this.closed); + }, + beforeDestroy() { + $(this.$el).off('shown.bs.modal', this.opened).off('hidden.bs.modal', this.closed); + }, methods: { emitCancel(event) { this.$emit('cancel', event); @@ -45,10 +53,11 @@ export default { emitSubmit(event) { this.$emit('submit', event); }, - opened({ propertyName }) { - if (propertyName === 'opacity') { - this.$emit('open'); - } + opened() { + this.$emit('open'); + }, + closed() { + this.$emit('closed'); }, }, }; @@ -60,7 +69,6 @@ export default { class="modal fade" tabindex="-1" role="dialog" - @transitionend="opened" > <div :class="modalSizeClass" |