@glitchr/transparent 1.0.42 → 1.0.44

package/package.json

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

package/src/js/transparent.js

@@ -522,10 +522,6 @@
 
             if(el.target && el.target.tagName == "FORM") {
 
-                // Action must be prevented here
-                // This is specific to form submission
-                el.preventDefault();
-
                 var href = el.target.getAttribute("action");
                 if(!href) href = location.pathname + href;
 
@@ -1416,6 +1412,7 @@
         return elementsXY;
     }
 
+    var formSubmission = false;
     function __main__(e) {
 
         // Disable transparent JS (e.g. during development..)
@@ -1434,7 +1431,15 @@
         var target = Transparent.isElement(link[2]) ? link[2] : undefined;
         var data   = Transparent.isElement(link[2]) ? undefined : link[2];
 
+        // Wait for transparent window event to be triggered
+        if (!isReady) return;
+
+        if (e.type != Transparent.state.POPSTATE   &&
+            e.type != Transparent.state.HASHCHANGE && !$(this).find(Settings.identifier).length) return;
+
         var form   = target != undefined && target.tagName == "FORM" ? target : undefined;
+        formSubmission = false;
+
         if (form) {
 
             data = new FormData();
@@ -1453,16 +1458,15 @@
                     } else data.append(this.name, this.value);
                 });
 
-            $(form).one("submit", function(e) { // Disable form submit button, after all submit events got processed
-                $(form).find(':submit').attr('disabled', 'disabled');
-            });
-        }
+            // Force page reload
+            formSubmission = true; // mark as form submission
 
-        // Wait for transparent window event to be triggered
-        if (!isReady) return;
+            if ($(e.target).hasClass(Transparent.state.RELOAD)) return;
+            if ($(form).hasClass(Transparent.state.RELOAD)) return;
 
-        if (e.type != Transparent.state.POPSTATE   &&
-            e.type != Transparent.state.HASHCHANGE && !$(this).find(Settings.identifier).length) return;
+            if(e.type == "submit")
+                $(form).find(':submit').attr('disabled', 'disabled');
+        }
 
         // Specific page exception
         for(i = 0; i < Settings.exceptions.length; i++) {
@@ -1479,7 +1483,7 @@
 
         // Unsecure url
         if (url.origin != location.origin) return;
-return;
+
         e.preventDefault();
 
         if (url == location) return;
@@ -1648,13 +1652,15 @@ return;
         // It is null when dev is pushing or replacing state
         var addNewState = !e.state;
         if (addNewState) {
-
+            
             if(history.state)
-                Transparent.setResponsePosition(history.state.uuid, Transparent.getScrollableElementXY());
+                Transparent.setResponse(history.state.uuid, Transparent.html[0], Transparent.getScrollableElementXY());
 
             $(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"));
+
             var xhr = new XMLHttpRequest();
             return jQuery.ajax({
                 url: url.href,
@@ -1712,8 +1718,9 @@ return;
             });
         });
 
-        window.onbeforeunload = function() {
+        window.onbeforeunload = function(e) {
 
+            if(formSubmission) return; // Do not display on form submission
             if(Settings.disable) return;
 
             var preventDefault = false;