0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
This commit is contained in:
Heinrich Fenkart 2014-10-10 08:35:56 +02:00
parent 42311c86c1
commit 4a89fd02b7
6 changed files with 13 additions and 15 deletions

File diff suppressed because one or more lines are too long

View File

@ -5503,7 +5503,7 @@ button.close {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1050; z-index: 1040;
display: none; display: none;
overflow: hidden; overflow: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@ -5551,7 +5551,6 @@ button.close {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1040;
background-color: #000; background-color: #000;
} }
.modal-backdrop.fade { .modal-backdrop.fade {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1015,14 +1015,13 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var doAnimate = $.support.transition && animate var doAnimate = $.support.transition && animate
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />') this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(this.$body) .prependTo(this.$element)
.on('click.dismiss.bs.modal', $.proxy(function (e) {
this.$element.on('click.dismiss.bs.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]) : this.hide.call(this)
: this.hide.call(this) }, this))
}, this))
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow if (doAnimate) this.$backdrop[0].offsetWidth // force reflow

File diff suppressed because one or more lines are too long