Fixed tabIndex conflict; Fixed register of multiple listeneres for wi…

…ndow events
AlexKrupko · Jun 13, 2021 · a5ae3b0 · a5ae3b0
1 parent e8fa81e
commit a5ae3b0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/dist/js/DatePickerX.js b/dist/js/DatePickerX.js
@@ -30,7 +30,8 @@
         titleFormatMonth : 'MM yyyy',
         titleFormatYear  : 'yyyy'
     },
-        openedDPX = null;
+        openedDPX = null,
+        globalEventsInitiated = false;
 
     /**
      * Creates and returns new DOM element
@@ -235,7 +236,7 @@
                     document.querySelectorAll('[href], input, select, textarea, button, iframe, object, embed, [tabindex], [contenteditable]')
                 ).filter(function(item)
                 {
-                    return focusableElements.indexOf(item) < 0;
+                    return focusableElements.indexOf(item) < 0 && item.tabIndex >= 0;
                 }).forEach(function(item)
                 {
                     item.dataset.datepickerxDisabledTabIndex = item.tabIndex;
@@ -267,6 +268,8 @@
                 {
                     item.tabIndex = -1;
                 });
+
+                openedDPX = null;
             }
         }
 
@@ -285,7 +288,7 @@
             };
 
             input.addEventListener('click', openDatePicker);
-            window.addEventListener('keydown', function(event)
+            !globalEventsInitiated && window.addEventListener('keydown', function(event)
             {
                 if (event.keyCode === 13) {
                     if (document.activeElement === input) {
@@ -306,7 +309,7 @@
                     }
                 }
             });
-            window.addEventListener('click', closeDatePicker);
+            !globalEventsInitiated && window.addEventListener('click', closeDatePicker);
             elements.container.addEventListener('click', function(e)
             {
                 e.stopPropagation();
@@ -351,6 +354,8 @@
             {
                 dpx.setValue(null) && closeDatePicker();
             });
+
+            globalEventsInitiated = true;
         }
 
         /**