From 2d8711e49b331dfb4f26154d437caa24f0e2b7b9 Mon Sep 17 00:00:00 2001 From: Joakim Riedel Date: Wed, 9 Sep 2020 10:28:27 +0200 Subject: [PATCH 1/5] fix bug with defaultPrevented --- js/src/modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/modal.js b/js/src/modal.js index b67507b1ee1f..27d3a76ec6bc 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -234,7 +234,7 @@ class Modal { const hideEventPrevented = $.Event(EVENT_HIDE_PREVENTED) $(this._element).trigger(hideEventPrevented) - if (hideEventPrevented.defaultPrevented) { + if (hideEventPrevented.isDefaultPrevented()) { return } From 96539951ab73b3bd339d714c8915fc7db8b23ec6 Mon Sep 17 00:00:00 2001 From: Joakim Riedel Date: Fri, 18 Sep 2020 14:48:35 +0200 Subject: [PATCH 2/5] tests hidePrevented can be prevented --- js/tests/unit/modal.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 3920fe387f6d..78ed2165b18e 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -976,4 +976,42 @@ $(function () { backdrop: 'static' }) }) + + QUnit.test('should get modal-static class when clicking outside of modal-content if backdrop = static', function (assert) { + assert.expect(1) + var done = assert.async() + var $modal = $('
').appendTo('#qunit-fixture') + + $modal.on('shown.bs.modal', function () { + $modal.trigger('click') + setTimeout(function () { + assert.ok($modal.hasClass('modal-static'), 'has modal-static class') + done() + }, 0) + }) + .bootstrapModal({ + backdrop: 'static' + }) + }) + + QUnit.test('should not get modal-static class when clicking outside of modal-content if backdrop = static and event is prevented', function (assert) { + assert.expect(1) + var done = assert.async() + var $modal = $('
').appendTo('#qunit-fixture') + + $modal.on('hidePrevented.bs.modal', function (e) { + e.preventDefault() + }) + + $modal.on('shown.bs.modal', function () { + $modal.trigger('click') + setTimeout(function () { + assert.notOk($modal.hasClass('modal-static'), 'should not have modal-static class') + done() + }, 0) + }) + .bootstrapModal({ + backdrop: 'static' + }) + }) }) From 717b4078ca5927165a2081a82c8ea77b055bd869 Mon Sep 17 00:00:00 2001 From: Joakim Riedel Date: Sat, 19 Sep 2020 11:00:15 +0200 Subject: [PATCH 3/5] merged two tests --- js/tests/unit/modal.js | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 78ed2165b18e..0b408cc66148 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -890,9 +890,9 @@ $(function () { }) QUnit.test('should not close modal when clicking outside of modal-content if backdrop = static', function (assert) { - assert.expect(1) + assert.expect(2) var done = assert.async() - var $modal = $('
').appendTo('#qunit-fixture') + var $modal = $('
').appendTo('#qunit-fixture') $modal.on('shown.bs.modal', function () { $modal.trigger('click') @@ -900,6 +900,7 @@ $(function () { var modal = $modal.data('bs.modal') assert.strictEqual(modal._isShown, true) + assert.ok($modal.hasClass('modal-static'), 'has modal-static class') done() }, 10) }) @@ -977,23 +978,6 @@ $(function () { }) }) - QUnit.test('should get modal-static class when clicking outside of modal-content if backdrop = static', function (assert) { - assert.expect(1) - var done = assert.async() - var $modal = $('
').appendTo('#qunit-fixture') - - $modal.on('shown.bs.modal', function () { - $modal.trigger('click') - setTimeout(function () { - assert.ok($modal.hasClass('modal-static'), 'has modal-static class') - done() - }, 0) - }) - .bootstrapModal({ - backdrop: 'static' - }) - }) - QUnit.test('should not get modal-static class when clicking outside of modal-content if backdrop = static and event is prevented', function (assert) { assert.expect(1) var done = assert.async() From ab6861cd20414496bf57640924006e9a03c4c024 Mon Sep 17 00:00:00 2001 From: Joakim Riedel Date: Mon, 21 Sep 2020 10:28:38 +0200 Subject: [PATCH 4/5] Revert "merged two tests" This reverts commit 717b4078ca5927165a2081a82c8ea77b055bd869. --- js/tests/unit/modal.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 7c87e611e757..12e7d13e289c 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -890,9 +890,9 @@ $(function () { }) QUnit.test('should not close modal when clicking outside of modal-content if backdrop = static', function (assert) { - assert.expect(2) + assert.expect(1) var done = assert.async() - var $modal = $('
').appendTo('#qunit-fixture') + var $modal = $('
').appendTo('#qunit-fixture') $modal.on('shown.bs.modal', function () { $modal.trigger('click') @@ -900,7 +900,6 @@ $(function () { var modal = $modal.data('bs.modal') assert.strictEqual(modal._isShown, true) - assert.ok($modal.hasClass('modal-static'), 'has modal-static class') done() }, 10) }) @@ -978,6 +977,23 @@ $(function () { }) }) + QUnit.test('should get modal-static class when clicking outside of modal-content if backdrop = static', function (assert) { + assert.expect(1) + var done = assert.async() + var $modal = $('
').appendTo('#qunit-fixture') + + $modal.on('shown.bs.modal', function () { + $modal.trigger('click') + setTimeout(function () { + assert.ok($modal.hasClass('modal-static'), 'has modal-static class') + done() + }, 0) + }) + .bootstrapModal({ + backdrop: 'static' + }) + }) + QUnit.test('should not get modal-static class when clicking outside of modal-content if backdrop = static and event is prevented', function (assert) { assert.expect(1) var done = assert.async() From 7ee94f5d77ef4a3525f0848995b783debe500b5e Mon Sep 17 00:00:00 2001 From: Joakim Riedel Date: Mon, 21 Sep 2020 10:35:51 +0200 Subject: [PATCH 5/5] asserts event is triggered --- js/tests/unit/modal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 12e7d13e289c..60c3cba9dddc 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -995,11 +995,12 @@ $(function () { }) QUnit.test('should not get modal-static class when clicking outside of modal-content if backdrop = static and event is prevented', function (assert) { - assert.expect(1) + assert.expect(2) var done = assert.async() var $modal = $('
').appendTo('#qunit-fixture') $modal.on('hidePrevented.bs.modal', function (e) { + assert.ok(true, 'should trigger hidePrevented event') e.preventDefault() })