diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-21 08:06:51 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-21 08:06:51 +0000 |
| commit | 006bc124366078d717ea8a331fdfd1e2ccd3476f (patch) | |
| tree | ccdbbd4292f6e71a06159e99fea17e553c1a577c | |
| parent | 976f0dfaf6bd1686526d5144b97ea658f937abac (diff) | |
| parent | a28c77f2adcb1a355a7497bd3a46d86a4c5d4d05 (diff) | |
| download | gitlab-ce-006bc124366078d717ea8a331fdfd1e2ccd3476f.tar.gz | |
Merge branch 'winh-prevent-multiple-recaptcha-modals' into 'master'
Throw error for multiple RecaptchaModal instances
See merge request gitlab-org/gitlab-ce!32017
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/recaptcha_modal.vue | 7 | ||||
| -rw-r--r-- | spec/javascripts/issue_show/components/description_spec.js | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue b/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue index df19906309c..f0aae20477b 100644 --- a/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue +++ b/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue @@ -30,9 +30,16 @@ export default { }, mounted() { + if (window.recaptchaDialogCallback) { + throw new Error('recaptchaDialogCallback is already defined!'); + } window.recaptchaDialogCallback = this.submit.bind(this); }, + beforeDestroy() { + window.recaptchaDialogCallback = null; + }, + methods: { appendRecaptchaScript() { this.removeRecaptchaScript(); diff --git a/spec/javascripts/issue_show/components/description_spec.js b/spec/javascripts/issue_show/components/description_spec.js index 7e00fbf2745..e10426a9858 100644 --- a/spec/javascripts/issue_show/components/description_spec.js +++ b/spec/javascripts/issue_show/components/description_spec.js @@ -1,5 +1,6 @@ import $ from 'jquery'; import Vue from 'vue'; +import '~/behaviors/markdown/render_gfm'; import Description from '~/issue_show/components/description.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; @@ -91,6 +92,7 @@ describe('Description component', () => { let TaskList; beforeEach(() => { + vm.$destroy(); vm = mountComponent( DescriptionComponent, Object.assign({}, props, { |