Fixing issue #56

Focus behaviour not correct for modal popup
ResponsiveBP · Jan 9, 2015 · b4cd15c · b4cd15c
1 parent 8e597d6
commit b4cd15c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/build/responsive.js b/build/responsive.js
@@ -2012,18 +2012,18 @@
             shownEvent = $.Event(eshown),
             complete = function () {
 
-                $modal.data("currentModal", self.$element);
-
-                $modal.focus();
+                $body.attr({ "tabindex": -1 });
+                $modal.data("currentModal", self.$element).attr({ "tabindex": 0 }).focus();
 
                 // Ensure that focus is maintained within the modal.
                 $(document).on(efocusin, function (event) {
+
                     if (event.target !== $overlay[0] && !$.contains($overlay[0], event.target)) {
-                        var $newTarget = $modal.find("input, select, a, iframe, img, button").first();
-                        $newTarget.length ? $newTarget.focus() : ((!self.options.modal && $close.focus()) || $overlay.focus());
-                        return false;
-                    }
+                        var $newTarget = $modal.find("a, area, button, input, object, select, textarea, [tabindex]").first();
+                        $newTarget.length ? $newTarget.focus() : $modal.focus();
 
+                        return false;
+                    }               
                     return true;
                 });
 
@@ -2090,8 +2090,9 @@
             hiddenEvent = $.Event(ehidden),
             complete = function () {
                 self.destroy(callback);
-                $modal.removeData("currentModal");
-                self.$element.trigger(hiddenEvent);
+                $body.removeAttr("tabindex");
+                $modal.removeData("currentModal").removeAttr("tabindex");
+                self.$element.trigger(hiddenEvent).focus();
             };
 
         this.$element.trigger(hideEvent);