Commit 7c785d2f authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '292891-jira-integration-changes-cannot-be-saved-using-firefox-browser' into 'master'

Fix integrations not saving on Firefox

See merge request gitlab-org/gitlab!50018
parents 259c247e bcd265ee
...@@ -59,9 +59,6 @@ export default { ...@@ -59,9 +59,6 @@ export default {
showReset() { showReset() {
return this.isInstanceOrGroupLevel && this.propsSource.resetPath; return this.isInstanceOrGroupLevel && this.propsSource.resetPath;
}, },
saveButtonKey() {
return `save-button-${this.isDisabled}`;
},
}, },
methods: { methods: {
...mapActions([ ...mapActions([
...@@ -120,7 +117,6 @@ export default { ...@@ -120,7 +117,6 @@ export default {
<div v-if="isEditable" class="footer-block row-content-block"> <div v-if="isEditable" class="footer-block row-content-block">
<template v-if="isInstanceOrGroupLevel"> <template v-if="isInstanceOrGroupLevel">
<gl-button <gl-button
:key="saveButtonKey"
v-gl-modal.confirmSaveIntegration v-gl-modal.confirmSaveIntegration
category="primary" category="primary"
variant="success" variant="success"
...@@ -134,7 +130,6 @@ export default { ...@@ -134,7 +130,6 @@ export default {
</template> </template>
<gl-button <gl-button
v-else v-else
:key="saveButtonKey"
category="primary" category="primary"
variant="success" variant="success"
type="submit" type="submit"
......
import $ from 'jquery'; import $ from 'jquery';
import { delay } from 'lodash';
import axios from '../lib/utils/axios_utils'; import axios from '../lib/utils/axios_utils';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import toast from '~/vue_shared/plugins/global_toast'; import toast from '~/vue_shared/plugins/global_toast';
...@@ -43,7 +44,9 @@ export default class IntegrationSettingsForm { ...@@ -43,7 +44,9 @@ export default class IntegrationSettingsForm {
const formValid = this.$form.get(0).checkValidity() || this.formActive === false; const formValid = this.$form.get(0).checkValidity() || this.formActive === false;
if (formValid) { if (formValid) {
this.$form.submit(); delay(() => {
this.$form.trigger('submit');
}, 100);
} else { } else {
eventHub.$emit('validateForm'); eventHub.$emit('validateForm');
this.vue.$store.dispatch('setIsSaving', false); this.vue.$store.dispatch('setIsSaving', false);
......
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