aboutsummaryrefslogtreecommitdiff
path: root/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorTobias Lindig <[email protected]>2014-01-17 13:21:57 +0100
committerChris Rebert <[email protected]>2014-01-17 12:16:53 -0800
commit084f0fb11351e899decc33faf53ada85d29ea7fa (patch)
treee923e5426582e9689bd344d974fc290a396c800c /dist/js/bootstrap.js
parentd6e8006ea6dde5f295a919d63164af04927a8b33 (diff)
downloadbootstrap-084f0fb11351e899decc33faf53ada85d29ea7fa.tar.xz
bootstrap-084f0fb11351e899decc33faf53ada85d29ea7fa.zip
add namespace `.bs` also to the event `dismiss.modal`
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r--dist/js/bootstrap.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 7a734f769..e9c545658 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -829,7 +829,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
this.escape()
- this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+ this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
this.backdrop(function () {
var transition = $.support.transition && that.$element.hasClass('fade')
@@ -882,7 +882,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
this.$element
.removeClass('in')
.attr('aria-hidden', true)
- .off('click.dismiss.modal')
+ .off('click.dismiss.bs.modal')
$.support.transition && this.$element.hasClass('fade') ?
this.$element
@@ -934,7 +934,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body)
- this.$element.on('click.dismiss.modal', $.proxy(function (e) {
+ this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
if (e.target !== e.currentTarget) return
this.options.backdrop == 'static'
? this.$element[0].focus.call(this.$element[0])