Merge pull request reactjs#31 from maisano/patch-1

Check if modalElement exists in handleFocus.
DaveVanVliet · May 8, 2015 · 1a51bf8 · 1a51bf8
2 parents 494d7d2 + e898b6b
commit 1a51bf8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/helpers/focusManager.js b/lib/helpers/focusManager.js
@@ -10,6 +10,9 @@ function handleBlur(event) {
 function handleFocus(event) {
   if (needToFocus) {
     needToFocus = false;
+    if (!modalElement) {
+      return;
+    }
     // need to see how jQuery shims document.on('focusin') so we don't need the
     // setTimeout, firefox doesn't support focusin, if it did, we could focus
     // the the element outisde of a setTimeout. Side-effect of this