Skip to content

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

fixes #4781

parent f3e45c37
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
docs/assets/js/bootstrap.js
View file @ e424b387
...@@ -817,7 +817,7 @@ ...@@ -817,7 +817,7 @@
var transition = $.support.transition && that.$element.hasClass('fade') var transition = $.support.transition && that.$element.hasClass('fade')
if (!that.$element.parent().length) { if (!that.$element.parent().length) {
that.$element.appendTo(document.body) //don't move modals dom position that.$element.appendTo(document.body) // don't move modals dom position
} }
that.$element.show() that.$element.show()
...@@ -835,7 +835,6 @@ ...@@ -835,7 +835,6 @@
transition ? transition ?
that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown.bs.modal') }) : that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown.bs.modal') }) :
that.$element.focus().trigger('shown.bs.modal') that.$element.focus().trigger('shown.bs.modal')
}) })
} }
...@@ -864,7 +863,9 @@ ...@@ -864,7 +863,9 @@
} }
Modal.prototype.enforceFocus = function () { Modal.prototype.enforceFocus = function () {
$(document).on('focusin.bs.modal', function (e) { $(document)
.off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', function (e) {
if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
this.$element.focus() this.$element.focus()
} }
......
docs/assets/js/bootstrap.min.js
View file @ e424b387
This diff is collapsed.
js/modal.js
View file @ e424b387
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
var transition = $.support.transition && that.$element.hasClass('fade') var transition = $.support.transition && that.$element.hasClass('fade')
if (!that.$element.parent().length) { if (!that.$element.parent().length) {
that.$element.appendTo(document.body) //don't move modals dom position that.$element.appendTo(document.body) // don't move modals dom position
} }
that.$element.show() that.$element.show()
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
transition ? transition ?
that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown.bs.modal') }) : that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown.bs.modal') }) :
that.$element.focus().trigger('shown.bs.modal') that.$element.focus().trigger('shown.bs.modal')
}) })
} }
...@@ -105,7 +104,9 @@ ...@@ -105,7 +104,9 @@
} }
Modal.prototype.enforceFocus = function () { Modal.prototype.enforceFocus = function () {
$(document).on('focusin.bs.modal', function (e) { $(document)
.off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', function (e) {
if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
this.$element.focus() this.$element.focus()
} }
......
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