Fixed a JavaScript issue with multiple dialogs

KittyGiraudel · Mar 17, 2016 · cf3f5d8 · cf3f5d8
1 parent 66b9079
commit cf3f5d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/a11y-dialog.js b/a11y-dialog.js
@@ -70,25 +70,27 @@
       }
     });
 
-    document.body.addEventListener('focus', function (event) {
+    function maintainFocus (event) {
       if (that.shown && !node.contains(event.target)) {
         setFocusToFirstItem(node);
       }
-    }, true);
+    }
 
     function show () {
       that.shown = true;
       node.removeAttribute('aria-hidden');
       main.setAttribute('aria-hidden', 'true');
       focusedBeforeDialog = document.activeElement;
       setFocusToFirstItem(node);
+      document.body.addEventListener('focus', maintainFocus, true);
     }
 
     function hide () {
       that.shown = false;
       node.setAttribute('aria-hidden', 'true');
       main.removeAttribute('aria-hidden');
       focusedBeforeDialog.focus();
+      document.body.removeEventListener('focus', maintainFocus, true);
     }
   };
 

diff --git a/a11y-dialog.min.js b/a11y-dialog.min.js
diff --git a/example/main.js b/example/main.js
@@ -70,25 +70,27 @@
       }
     });
 
-    document.body.addEventListener('focus', function (event) {
+    function maintainFocus (event) {
       if (that.shown && !node.contains(event.target)) {
         setFocusToFirstItem(node);
       }
-    }, true);
+    }
 
     function show () {
       that.shown = true;
       node.removeAttribute('aria-hidden');
       main.setAttribute('aria-hidden', 'true');
       focusedBeforeDialog = document.activeElement;
       setFocusToFirstItem(node);
+      document.body.addEventListener('focus', maintainFocus, true);
     }
 
     function hide () {
       that.shown = false;
       node.setAttribute('aria-hidden', 'true');
       main.removeAttribute('aria-hidden');
       focusedBeforeDialog.focus();
+      document.body.removeEventListener('focus', maintainFocus, true);
     }
   };