diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 18:09:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 18:09:44 +0300 |
commit | b85aae44f96c152c62952f4d3051223cdf0692be (patch) | |
tree | 8ce4385b899e0f55b58368c8d5d15b430a8af205 /app/assets/javascripts/confirm_danger_modal.js | |
parent | 79850719759d6fe1b0682fd27573d479c9013f03 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/confirm_danger_modal.js')
-rw-r--r-- | app/assets/javascripts/confirm_danger_modal.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/confirm_danger_modal.js b/app/assets/javascripts/confirm_danger_modal.js index 262d501bfba..7321e4d18cc 100644 --- a/app/assets/javascripts/confirm_danger_modal.js +++ b/app/assets/javascripts/confirm_danger_modal.js @@ -1,4 +1,5 @@ import $ from 'jquery'; +import { Rails } from '~/lib/utils/rails_ujs'; import { rstrip } from './lib/utils/common_utils'; function openConfirmDangerModal($form, $modal, text) { @@ -21,9 +22,16 @@ function openConfirmDangerModal($form, $modal, text) { $submit.disable(); } }); + $('.js-confirm-danger-submit', $modal) .off('click') - .on('click', () => $form.submit()); + .on('click', () => { + if ($form.data('remote')) { + Rails.fire($form[0], 'submit'); + } else { + $form.submit(); + } + }); } function getModal($btn) { |