diff options
author | fat <fat@folders.local> | 2015-05-13 23:43:56 +0300 |
---|---|---|
committer | fat <fat@folders.local> | 2015-05-13 23:43:56 +0300 |
commit | b0d142334f0d15e63577b28e2d7045c2199dcd6a (patch) | |
tree | 6fe7abb420ee0ea4bc4cc100a8410f300967b570 /js/dist/modal.js | |
parent | 7ef0e52fd042da2fdf107a3347abab3486a67790 (diff) |
fix #15301
Diffstat (limited to 'js/dist/modal.js')
-rw-r--r-- | js/dist/modal.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/dist/modal.js b/js/dist/modal.js index 25292b2758..80a493777d 100644 --- a/js/dist/modal.js +++ b/js/dist/modal.js @@ -31,6 +31,7 @@ var Modal = (function ($) { var Default = { backdrop: true, keyboard: true, + focus: true, show: true }; @@ -206,14 +207,14 @@ var Modal = (function ($) { $(this._element).addClass(ClassName.IN); - this._enforceFocus(); + if (this._config.focus) this._enforceFocus(); var shownEvent = $.Event(Event.SHOWN, { relatedTarget: relatedTarget }); var transitionComplete = function transitionComplete() { - _this2._element.focus(); + if (_this2._config.focus) _this2._element.focus(); $(_this2._element).trigger(shownEvent); }; |