From b0d142334f0d15e63577b28e2d7045c2199dcd6a Mon Sep 17 00:00:00 2001
From: fat <fat@folders.local>
Date: Wed, 13 May 2015 13:43:56 -0700
Subject: fix #15301

---
 js/dist/modal.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/dist/modal.js')

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);
         };
 
-- 
cgit v1.2.3