@glitchr/transparent 1.0.51 → 1.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glitchr/transparent",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "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)
@@ -1454,6 +1457,7 @@
             e.type != Transparent.state.HASHCHANGE && !$(this).find(Settings.identifier).length) return;
 
         var form   = target != undefined && target.tagName == "FORM" ? target : undefined;
+        var formTrigger = undefined;
         formSubmission = false;
 
         if (form) {
@@ -1464,7 +1468,7 @@
             var formInput = undefined; // In case of form ambiguity (two form with same name, restrict the data to the target form, if not extends it to each element with standard name)
             if(formAmbiguity) formInput = $(form).find(":input, [name^='"+form.name+"\[']");
             else formInput = $("form[name='"+form.name+"'] :input, [name^='"+form.name+"\[']");
-                
+
             formInput.each(function() {
 
                 if(this.tagName == "BUTTON") {
@@ -1481,7 +1485,7 @@
 
             // Force page reload
             formSubmission = true; // mark as form submission
-
+            formTrigger = e.target;
             if ($(e.target).hasClass(Transparent.state.RELOAD)) return;
             if ($(form).hasClass(Transparent.state.RELOAD)) return;
 
@@ -1691,8 +1695,7 @@
             $(Transparent.html).prop("user-scroll", false); // make sure to avoid page jump during transition (cancelled in activeIn callback)
 
             // Submit ajax request..
-            if(form) form.dispatchEvent(new Event("submit"));
-
+            if(form) form.dispatchEvent(new SubmitEvent("submit", { submitter: formTrigger }));
             var xhr = new XMLHttpRequest();
             return jQuery.ajax({
                 url: url.href,