summaryrefslogtreecommitdiff
path: root/xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js
diff options
context:
space:
mode:
Diffstat (limited to 'xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js')
-rw-r--r--xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js b/xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js
index 5049ccc..f84142d 100644
--- a/xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js
+++ b/xstatic/pkg/bootstrap_scss/data/js/bootstrap/modal.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: modal.js v3.3.6
+ * Bootstrap: modal.js v3.3.7
* http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -33,7 +33,7 @@
}
}
- Modal.VERSION = '3.3.6'
+ Modal.VERSION = '3.3.7'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -140,7 +140,9 @@
$(document)
.off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', $.proxy(function (e) {
- if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+ if (document !== e.target &&
+ this.$element[0] !== e.target &&
+ !this.$element.has(e.target).length) {
this.$element.trigger('focus')
}
}, this))