Check if modalElement exists in handleFocus.

A race condition happens if you open a new window before closing the modal, as opening a new window has the side effect of blurring the current window.
jaksenko · Apr 30, 2015 · e898b6b · e898b6b
1 parent 0b2028e
commit e898b6b
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