Change the order of methods run on init (#319)

This PR re-orders the initialization flow so that a modal can't hit a frozen state if it's not finished loading.
sebnitu · Aug 15, 2020 · 22a015a · 22a015a
1 parent d2bea65
commit 22a015a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/docs/dist/scripts.js b/docs/dist/scripts.js
@@ -1384,9 +1384,9 @@
     api.memory = {};
 
     api.init = function () {
-      setInitialState();
-      setTabindex();
       moveModals();
+      setTabindex();
+      setInitialState();
       document.addEventListener('click', handler, false);
       document.addEventListener('touchend', handler, false);
       document.addEventListener('keyup', handlerEscape, false);

diff --git a/docs/dist/scripts.min.js b/docs/dist/scripts.min.js
diff --git a/packages/modal/dist/scripts.js b/packages/modal/dist/scripts.js
@@ -741,9 +741,9 @@
 	  api.memory = {};
 
 	  api.init = function () {
-	    setInitialState();
-	    setTabindex();
 	    moveModals();
+	    setTabindex();
+	    setInitialState();
 	    document.addEventListener('click', handler, false);
 	    document.addEventListener('touchend', handler, false);
 	    document.addEventListener('keyup', handlerEscape, false);

diff --git a/packages/modal/dist/scripts.min.js b/packages/modal/dist/scripts.min.js
diff --git a/packages/modal/index.js b/packages/modal/index.js
@@ -40,9 +40,9 @@ export default function (options) {
   api.memory = {};
 
   api.init = () => {
-    setInitialState();
-    setTabindex();
     moveModals();
+    setTabindex();
+    setInitialState();
     document.addEventListener('click', handler, false);
     document.addEventListener('touchend', handler, false);
     document.addEventListener('keyup', handlerEscape, false);

diff --git a/packages/vrembem/dist/scripts.js b/packages/vrembem/dist/scripts.js
@@ -1413,9 +1413,9 @@
     api.memory = {};
 
     api.init = function () {
-      setInitialState();
-      setTabindex();
       moveModals();
+      setTabindex();
+      setInitialState();
       document.addEventListener('click', handler, false);
       document.addEventListener('touchend', handler, false);
       document.addEventListener('keyup', handlerEscape, false);

diff --git a/packages/vrembem/dist/scripts.min.js b/packages/vrembem/dist/scripts.min.js