make sure triggering element is visible before focusing #7521

2cccc088 · fat · a7a9a143 · 2cccc088 · 2cccc088 · 2cccc088
Commit 2cccc088 authored Jul 17, 2013 by fat
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

docs/assets/js/bootstrap.js docs/assets/js/bootstrap.js +1 -1

docs/assets/js/bootstrap.min.js docs/assets/js/bootstrap.min.js +1 -1

js/modal.js js/modal.js +1 -1

No files found.
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -1011,7 +1011,7 @@
    $target
      .modal(option)
      .one('hide', function () {
-        $this.focus()
+        $this.is(':visible') && $this.focus()
      })
    })


--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
--- a/js/modal.js
+++ b/js/modal.js
@@ -232,7 +232,7 @@
    $target
      .modal(option)
      .one('hide', function () {
-        $this.focus()
+        $this.is(':visible') && $this.focus()
      })
    })