Skip to content

Commit

Permalink
add namespace .bs also to the event dismiss.modal
Browse files Browse the repository at this point in the history
  • Loading branch information
tlindig authored and cvrebert committed Jan 17, 2014
1 parent d6e8006 commit 084f0fb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions dist/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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])
Expand Down
Loading

0 comments on commit 084f0fb

Please sign in to comment.