Fixed bug when closing modal with keyboard

nico3333fr · Apr 19, 2017 · da97f1b · da97f1b
1 parent 8ca553c
commit da97f1b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description": "ES2015 accessible modal window system, using ARIA (compatible IE9+ when transpiled)",
   "homepage": "https://van11y.net/accessible-modal/",
   "main": "van11y-accessible-modal-window-aria.es6.js",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "keywords": [
     "Accessibility",
     "ARIA",

diff --git a/dist/van11y-accessible-modal-window-aria.es6.js b/dist/van11y-accessible-modal-window-aria.es6.js
@@ -366,7 +366,7 @@
                         let body = doc.querySelector('body');
                         let wrapperBody = findById(WRAPPER_PAGE_JS);
                         let modal = findById(MODAL_JS_ID);
-                        let modalContent = findById(MODAL_CONTENT_JS_ID);
+                        let modalContent = findById(MODAL_CONTENT_JS_ID) ? findById(MODAL_CONTENT_JS_ID).innerHTML : '';
                         let overlay = findById(MODAL_OVERLAY_ID);
                         let modalButtonClose = findById(MODAL_BUTTON_JS_ID);
                         let modalFocusBackId = modalButtonClose.getAttribute(MODAL_BUTTON_FOCUS_BACK_ID);

diff --git a/dist/van11y-accessible-modal-window-aria.js b/dist/van11y-accessible-modal-window-aria.js
@@ -87,7 +87,7 @@
         while (el.firstChild)
             wrapper_el.append(el.firstChild);
         el.append(wrapper_el);
-     }*/
+      }*/
     function wrapInner(parent, wrapper) {
         if (typeof wrapper === "string") wrapper = document.createElement(wrapper);
 
@@ -297,7 +297,7 @@
                     var body = doc.querySelector('body');
                     var wrapperBody = findById(WRAPPER_PAGE_JS);
                     var modal = findById(MODAL_JS_ID);
-                    var modalContent = findById(MODAL_CONTENT_JS_ID);
+                    var modalContent = findById(MODAL_CONTENT_JS_ID) ? findById(MODAL_CONTENT_JS_ID).innerHTML : '';
                     var overlay = findById(MODAL_OVERLAY_ID);
                     var modalButtonClose = findById(MODAL_BUTTON_JS_ID);
                     var modalFocusBackId = modalButtonClose.getAttribute(MODAL_BUTTON_FOCUS_BACK_ID);

diff --git a/dist/van11y-accessible-modal-window-aria.min.js b/dist/van11y-accessible-modal-window-aria.min.js
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "name": "van11y-accessible-modal-window-aria",
   "description": "ES2015 accessible modal window system, using ARIA (compatible IE9+ when transpiled)",
   "main": "dist/van11y-accessible-modal-window-aria.min.js",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "keywords": [
     "Accessibility",
     "ARIA",

diff --git a/src/van11y-accessible-modal-window-aria.es6.js b/src/van11y-accessible-modal-window-aria.es6.js
@@ -366,7 +366,7 @@
                         let body = doc.querySelector('body');
                         let wrapperBody = findById(WRAPPER_PAGE_JS);
                         let modal = findById(MODAL_JS_ID);
-                        let modalContent = findById(MODAL_CONTENT_JS_ID);
+                        let modalContent = findById(MODAL_CONTENT_JS_ID) ? findById(MODAL_CONTENT_JS_ID).innerHTML : '';
                         let overlay = findById(MODAL_OVERLAY_ID);
                         let modalButtonClose = findById(MODAL_BUTTON_JS_ID);
                         let modalFocusBackId = modalButtonClose.getAttribute(MODAL_BUTTON_FOCUS_BACK_ID);