diff options
| author | Chris Rebert <[email protected]> | 2014-08-15 11:30:35 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-08-15 11:30:35 -0700 |
| commit | 8194668c52f9fd5f3974409f1871c3882f39f4c2 (patch) | |
| tree | 3104f87ee996361f0be5d466017237262cd39e31 | |
| parent | a9b7ba419a3f0b0ef0fc71a553d323c2d07af604 (diff) | |
| parent | 75bffd84aeac85c98e6e537d05293e9c8823127d (diff) | |
| download | bootstrap-8194668c52f9fd5f3974409f1871c3882f39f4c2.tar.xz bootstrap-8194668c52f9fd5f3974409f1871c3882f39f4c2.zip | |
Merge pull request #14316 from hnrch02/use-closest-alert
Use closest `.alert` for alert dismissal; closes #14306
| -rw-r--r-- | js/alert.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/alert.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/alert.js b/js/alert.js index 5389c32e9..10483899d 100644 --- a/js/alert.js +++ b/js/alert.js @@ -36,7 +36,7 @@ if (e) e.preventDefault() if (!$parent.length) { - $parent = $this.hasClass('alert') ? $this : $this.parent() + $parent = $this.closest('.alert') } $parent.trigger(e = $.Event('close.bs.alert')) diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 52505c828..bc4eed676 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -30,7 +30,7 @@ $(function () { }) test('should fade element out on clicking .close', function () { - var alertHTML = '<div class="alert-message warning fade in">' + var alertHTML = '<div class="alert alert-danger fade in">' + '<a class="close" href="#" data-dismiss="alert">×</a>' + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' + '</div>' @@ -42,17 +42,17 @@ $(function () { }) test('should remove element when clicking .close', function () { - var alertHTML = '<div class="alert-message warning fade in">' + var alertHTML = '<div class="alert alert-danger fade in">' + '<a class="close" href="#" data-dismiss="alert">×</a>' + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' + '</div>' var $alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert() - notEqual($('#qunit-fixture').find('.alert-message').length, 0, 'element added to dom') + notEqual($('#qunit-fixture').find('.alert').length, 0, 'element added to dom') $alert.find('.close').click() - equal($('#qunit-fixture').find('.alert-message').length, 0, 'element removed from dom') + equal($('#qunit-fixture').find('.alert').length, 0, 'element removed from dom') }) test('should not fire closed when close is prevented', function () { |