diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-03-25 05:20:09 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-03-25 05:20:09 +0400 |
| commit | bccc2cb7191eb54a4d67563625a748d7ecd381d4 (patch) | |
| tree | c4562643867c197b7f7f5792694e3e10aab8de52 /docs/assets/js/bootstrap-alert.js | |
| parent | ef5ac02b698ffab3a42d21f20859b70df85543c0 (diff) | |
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
Diffstat (limited to 'docs/assets/js/bootstrap-alert.js')
| -rw-r--r-- | docs/assets/js/bootstrap-alert.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index d17f44e150..7a1607da15 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -45,15 +45,16 @@ } $parent = $(selector) - $parent.trigger('close') e && e.preventDefault() $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent - .trigger('close') - .removeClass('in') + $parent.trigger(e = $.Event('close')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') function removeElement() { $parent |