Commit 554492fd authored by Dheeraj Joshi's avatar Dheeraj Joshi

Skip navigation modal for cancel button

This fixes an issue which shows confirmation
modal twice when user navigates away upon cancel

Changelog: fixed
parent 60ce5930
...@@ -71,7 +71,7 @@ export default () => { ...@@ -71,7 +71,7 @@ export default () => {
const isMarkdown = editBlobForm.data('is-markdown'); const isMarkdown = editBlobForm.data('is-markdown');
const previewMarkdownPath = editBlobForm.data('previewMarkdownPath'); const previewMarkdownPath = editBlobForm.data('previewMarkdownPath');
const commitButton = $('.js-commit-button'); const commitButton = $('.js-commit-button');
const cancelLink = $('.btn.btn-cancel'); const cancelLink = $('#cancel-changes');
import('./edit_blob') import('./edit_blob')
.then(({ default: EditBlob } = {}) => { .then(({ default: EditBlob } = {}) => {
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
= button_tag 'Commit changes', id: 'commit-changes', class: 'gl-button btn btn-confirm js-commit-button qa-commit-button' = button_tag 'Commit changes', id: 'commit-changes', class: 'gl-button btn btn-confirm js-commit-button qa-commit-button'
= link_to _('Cancel'), cancel_path, = link_to _('Cancel'), cancel_path,
class: 'gl-button btn btn-default gl-ml-3', data: {confirm: leave_edit_message, confirm_btn_variant: "danger"}, aria: { label: _('Discard changes') } id: 'cancel-changes', class: 'gl-button btn btn-default gl-ml-3', data: {confirm: leave_edit_message, confirm_btn_variant: "danger"}, aria: { label: _('Discard changes') }
= render 'shared/projects/edit_information' = render 'shared/projects/edit_information'
...@@ -25,7 +25,7 @@ describe('BlobBundle', () => { ...@@ -25,7 +25,7 @@ describe('BlobBundle', () => {
setFixtures(` setFixtures(`
<div class="js-edit-blob-form" data-blob-filename="blah"> <div class="js-edit-blob-form" data-blob-filename="blah">
<button class="js-commit-button"></button> <button class="js-commit-button"></button>
<a class="btn btn-cancel" href="#"></a> <button id='cancel-changes'></button>
</div>`); </div>`);
blobBundle(); blobBundle();
...@@ -42,7 +42,7 @@ describe('BlobBundle', () => { ...@@ -42,7 +42,7 @@ describe('BlobBundle', () => {
}); });
it('removes beforeunload listener when cancel link is clicked', () => { it('removes beforeunload listener when cancel link is clicked', () => {
$('.btn.btn-cancel').click(); $('#cancel-changes').click();
expect(window.onbeforeunload).toBeNull(); expect(window.onbeforeunload).toBeNull();
}); });
...@@ -61,7 +61,7 @@ describe('BlobBundle', () => { ...@@ -61,7 +61,7 @@ describe('BlobBundle', () => {
data-human-access="owner" data-human-access="owner"
data-merge-request-path="path/to/mr"> data-merge-request-path="path/to/mr">
<button id='commit-changes' class="js-commit-button"></button> <button id='commit-changes' class="js-commit-button"></button>
<a class="btn btn-cancel" href="#"></a> <button id='cancel-changes'></button>
</div> </div>
</div>`); </div>`);
......
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