@glitchr/transparent 1.0.52 → 1.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glitchr/transparent",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "description": "Transparent SPA Application",
   "main": "src/index.js",
   "access": "public",

package/src/js/transparent.js

@@ -425,6 +425,8 @@
             else console.debug("Transparent is running..");
         }
 
+        if(!isReady) dispatchEvent(new Event('transparent:'+Transparent.state.FIRST));
+
         isReady = true;
 
         dispatchEvent(new Event('transparent:'+Transparent.state.READY));
@@ -832,29 +834,30 @@
             Transparent.callback(function() {
 
                 Transparent.html.removeClass(Transparent.state.ACTIVEOUT);
-                if(!Transparent.html.hasClass(Transparent.state.POSTACTIVE)){
-
-                    Transparent.html.removeClass(Transparent.state.POSTACTIVE);
-                    dispatchEvent(new Event('transparent:'+Transparent.state.POSTACTIVE));
-                }
-
                 if(Transparent.html.hasClass(Transparent.state.LOADING)) {
 
-                    dispatchEvent(new Event('transparent:load'));
+                    dispatchEvent(new Event('transparent:'+Transparent.state.LOAD));
 
                     Object.values(Transparent.state).forEach(e => Transparent.html.removeClass(e));
                     Transparent.html.addClass(Transparent.state.ROOT + " " + Transparent.state.READY);
-
-                } else {
-
-                    Transparent.html.removeClass(Transparent.state.POSTACTIVE);
                 }
+                
+                Transparent.html.addClass(Transparent.state.POSTACTIVE);
+               
+                var active = Transparent.activeTime();
+                Transparent.callback(function() {
+                    
+                    Transparent.html.removeClass(Transparent.state.POSTACTIVE);
+                    dispatchEvent(new Event('transparent:'+Transparent.state.POSTACTIVE));
 
+                }, active.duration+active.delay);
+            
             }, active.duration);
 
         }.bind(this), active.delay);
     }
 
+
     Transparent.replaceCanvases = function(dom) {
 
         // Extract existing canvas to avoid redrawing them.. (time consuming)
@@ -1428,6 +1431,7 @@
         return elementsXY;
     }
 
+    var ajaxSemaphore = false;
     var formSubmission = false;
     function __main__(e) {
 
@@ -1486,7 +1490,7 @@
             if ($(e.target).hasClass(Transparent.state.RELOAD)) return;
             if ($(form).hasClass(Transparent.state.RELOAD)) return;
 
-            if(e.type == "submit")
+            if(e.type == "submit") // NB: This doesn't work if a button is generated afterward.. 
                 $(form).find(':submit').attr('disabled', 'disabled');
         }
 
@@ -1508,6 +1512,7 @@
 
         e.preventDefault();
 
+        if (ajaxSemaphore) return;
         if (url == location) return;
 
         if((e.type == Transparent.state.CLICK || e.type == Transparent.state.HASHCHANGE) && url.pathname == location.pathname && url.search == location.search && type != "POST") {
@@ -1543,6 +1548,8 @@
 
         function handleResponse(uuid, status = 200, method = null, data = null, xhr = null, request = null) {
 
+            ajaxSemaphore = false;
+            
             var responseURL;
             responseURL = xhr !== null ? xhr.responseURL : url.href;
 
@@ -1584,6 +1591,7 @@
                 }
 
                 if(form) {
+                    
                     $(form).find(':submit').removeAttr('disabled');
                     form.reset();
                 }
@@ -1694,6 +1702,8 @@
             // Submit ajax request..
             if(form) form.dispatchEvent(new SubmitEvent("submit", { submitter: formTrigger }));
             var xhr = new XMLHttpRequest();
+
+            ajaxSemaphore = true;
             return jQuery.ajax({
                 url: url.href,
                 type: type,