Skip to content

B
bootstrap
Commit a4f0e8d3 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

fixes #9111

parent dbed9da7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 143 deletions
dist/js/bootstrap.js
View file @ a4f0e8d3
...@@ -925,6 +925,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } ...@@ -925,6 +925,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
this.$element this.$element
.removeClass('in') .removeClass('in')
.attr('aria-hidden', true) .attr('aria-hidden', true)
.off('click.dismiss.modal')
$.support.transition && this.$element.hasClass('fade') ? $.support.transition && this.$element.hasClass('fade') ?
this.$element this.$element
...@@ -977,7 +978,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } ...@@ -977,7 +978,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />') this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body) .appendTo(document.body)
this.$element.on('click', $.proxy(function (e) { this.$element.on('click.dismiss.modal', $.proxy(function (e) {
if (e.target !== e.currentTarget) return if (e.target !== e.currentTarget) return
this.options.backdrop == 'static' this.options.backdrop == 'static'
? this.$element[0].focus.call(this.$element[0]) ? this.$element[0].focus.call(this.$element[0])
......
dist/js/bootstrap.min.js
View file @ a4f0e8d3
This diff is collapsed.
js/modal.js
View file @ a4f0e8d3
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
this.$element this.$element
.removeClass('in') .removeClass('in')
.attr('aria-hidden', true) .attr('aria-hidden', true)
.off('click.dismiss.modal')
$.support.transition && this.$element.hasClass('fade') ? $.support.transition && this.$element.hasClass('fade') ?
this.$element this.$element
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />') this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body) .appendTo(document.body)
this.$element.on('click', $.proxy(function (e) { this.$element.on('click.dismiss.modal', $.proxy(function (e) {
if (e.target !== e.currentTarget) return if (e.target !== e.currentTarget) return
this.options.backdrop == 'static' this.options.backdrop == 'static'
? this.$element[0].focus.call(this.$element[0]) ? this.$element[0].focus.call(this.$element[0])
......
js/tests/unit/modal.js
View file @ a4f0e8d3
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment