diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/assets/javascripts/lib/utils/rails_ujs.js | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) | |
download | gitlab-ce-41fe97390ceddf945f3d967b8fdb3de4c66b7dea.tar.gz |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/lib/utils/rails_ujs.js')
-rw-r--r-- | app/assets/javascripts/lib/utils/rails_ujs.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/rails_ujs.js b/app/assets/javascripts/lib/utils/rails_ujs.js index 6b1985a23ba..b4f425da871 100644 --- a/app/assets/javascripts/lib/utils/rails_ujs.js +++ b/app/assets/javascripts/lib/utils/rails_ujs.js @@ -1,5 +1,6 @@ import Rails from '@rails/ujs'; import { confirmViaGlModal } from './confirm_via_gl_modal/confirm_via_gl_modal'; +import { ignoreWhilePending } from './ignore_while_pending'; function monkeyPatchConfirmModal() { /** @@ -18,8 +19,10 @@ function monkeyPatchConfirmModal() { * @param element {HTMLElement} Element that was clicked on * @returns {boolean} */ + const safeConfirm = ignoreWhilePending(confirmViaGlModal); + function confirmViaModal(message, element) { - confirmViaGlModal(message, element) + safeConfirm(message, element) .then((confirmed) => { if (confirmed) { Rails.confirm = () => true; |