From 0b16c8c6d9a9690d537bd08eac8a8292ebf938cd Mon Sep 17 00:00:00 2001 From: Johann-S Date: Mon, 21 Aug 2017 09:11:37 +0200 Subject: alert without jquery --- js/tests/index.html | 4 +++- js/tests/unit/.eslintrc.json | 3 ++- js/tests/unit/alert.js | 23 +++++++++++++---------- js/tests/visual/alert.html | 4 +++- js/tests/visual/button.html | 2 +- js/tests/visual/carousel.html | 2 +- js/tests/visual/collapse.html | 2 +- js/tests/visual/dropdown.html | 2 +- js/tests/visual/modal.html | 3 +-- js/tests/visual/popover.html | 3 +-- js/tests/visual/scrollspy.html | 2 +- js/tests/visual/tab.html | 2 +- 12 files changed, 29 insertions(+), 23 deletions(-) (limited to 'js/tests') diff --git a/js/tests/index.html b/js/tests/index.html index a3fd937c2..db0743f0f 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -97,7 +97,9 @@ - + + + diff --git a/js/tests/unit/.eslintrc.json b/js/tests/unit/.eslintrc.json index 86d851ad0..b07efd269 100644 --- a/js/tests/unit/.eslintrc.json +++ b/js/tests/unit/.eslintrc.json @@ -12,7 +12,8 @@ "Button": false, "Carousel": false, "Simulator": false, - "Toast": false + "Toast": false, + "EventHandler": false }, "parserOptions": { "ecmaVersion": 5, diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 65a8f9e76..32fcc6cea 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -70,16 +70,19 @@ $(function () { QUnit.test('should not fire closed when close is prevented', function (assert) { assert.expect(1) var done = assert.async() - $('
') - .on('close.bs.alert', function (e) { - e.preventDefault() - assert.ok(true, 'close event fired') - done() - }) - .on('closed.bs.alert', function () { - assert.ok(false, 'closed event fired') - }) - .bootstrapAlert('close') + var $alert = $('
') + $alert.appendTo('#qunit-fixture') + + EventHandler.on($alert[0], 'close.bs.alert', function (e) { + e.preventDefault() + assert.ok(true, 'close event fired') + done() + }) + EventHandler.on($alert[0], 'closed.bs.alert', function () { + assert.ok(false, 'closed event fired') + }) + + $alert.bootstrapAlert('close') }) QUnit.test('close should use internal _element if no element provided', function (assert) { diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html index d2befb8b8..9111e3572 100644 --- a/js/tests/visual/alert.html +++ b/js/tests/visual/alert.html @@ -52,7 +52,9 @@
- + + + diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html index ce900e471..818160da3 100644 --- a/js/tests/visual/button.html +++ b/js/tests/visual/button.html @@ -45,7 +45,7 @@
- + diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html index 895a6422c..d1376b39b 100644 --- a/js/tests/visual/carousel.html +++ b/js/tests/visual/carousel.html @@ -46,7 +46,7 @@ - + - + diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html index 9e4a10cfb..d1bb0ed35 100644 --- a/js/tests/visual/dropdown.html +++ b/js/tests/visual/dropdown.html @@ -205,7 +205,7 @@ - + diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index 53ad81a97..30975b0c7 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -207,13 +207,12 @@ - + - - + - - + diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html index 737679a78..3b8ce4026 100644 --- a/js/tests/visual/tab.html +++ b/js/tests/visual/tab.html @@ -227,7 +227,7 @@ - + -- cgit v1.2.3