diff options
| author | Alessandro Chitolina <[email protected]> | 2017-09-15 16:07:24 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2019-02-20 22:05:45 +0200 |
| commit | 33211eefdfb27eff7ba21886e16f2efdc0efa3e6 (patch) | |
| tree | f8f3f3342a6c2c2363448346debf52beb4954b21 /js/tests/unit/carousel.js | |
| parent | 9f9712b98c92678c709b2ad0adfa954e3c120911 (diff) | |
| download | bootstrap-33211eefdfb27eff7ba21886e16f2efdc0efa3e6.tar.xz bootstrap-33211eefdfb27eff7ba21886e16f2efdc0efa3e6.zip | |
Rewritten modal without jquery (#23955)
* Trigger jquery events if available in event handler
* Rewritten modal without jquery
Diffstat (limited to 'js/tests/unit/carousel.js')
| -rw-r--r-- | js/tests/unit/carousel.js | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index 615318ad3..fd9cf8509 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -619,13 +619,9 @@ $(function () { assert.strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active') -<<<<<<< HEAD - $template.trigger($.Event('keydown', { + EventHandler.trigger($template[0], 'keydown', { which: 37 - })) -======= - EventHandler.trigger($template[0], 'keydown', { which: 37 }) ->>>>>>> fix unit test for carousel + }) assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active') }) @@ -651,13 +647,9 @@ $(function () { assert.strictEqual($template.find('.carousel-item')[0], $template.find('.active')[0], 'first item active') -<<<<<<< HEAD - $template.trigger($.Event('keydown', { + EventHandler.trigger($template[0], 'keydown', { which: 39 - })) -======= - EventHandler.trigger($template[0], 'keydown', { which: 39 }) ->>>>>>> fix unit test for carousel + }) assert.strictEqual($template.find('.carousel-item')[1], $template.find('.active')[0], 'second item active') }) @@ -676,24 +668,14 @@ $(function () { $template.bootstrapCarousel() var done = assert.async() -<<<<<<< HEAD - var eventArrowDown = $.Event('keydown', { - which: 40 - }) - var eventArrowUp = $.Event('keydown', { - which: 38 - }) - - $template.one('keydown', function (event) { - assert.strictEqual(event.isDefaultPrevented(), false) -======= EventHandler.one($template[0], 'keydown', function (event) { assert.strictEqual(event.defaultPrevented, false) ->>>>>>> fix unit test for carousel }) // arrow down - EventHandler.trigger($template[0], 'keydown', { which: 40 }) + EventHandler.trigger($template[0], 'keydown', { + which: 40 + }) EventHandler.one($template[0], 'keydown', function (event) { assert.strictEqual(event.defaultPrevented, false) @@ -701,7 +683,9 @@ $(function () { }) // arrow up - EventHandler.trigger($template[0], 'keydown', { which: 38 }) + EventHandler.trigger($template[0], 'keydown', { + which: 38 + }) }) QUnit.test('should support disabling the keyboard navigation', function (assert) { |