@glitchr/transparent 1.0.44 → 1.0.46

package/package.json

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

package/src/js/transparent.js

@@ -419,6 +419,12 @@
         Transparent.configure({'x-ajax-request': true});
         Transparent.configure(options);
 
+        if(Settings.debug) {
+
+            if (Settings.disable) console.debug("Transparent is disabled..");
+            else console.debug("Transparent is running..");
+        }
+
         isReady = true;
 
         dispatchEvent(new Event('transparent:'+Transparent.state.READY));
@@ -463,6 +469,10 @@
             case "INPUT":
             case "BUTTON":
                 var form = $(el).closest("form");
+                if (form.length) return form[0];
+
+                var formName = $(el).attr("name").split("[")[0];
+                form = $("form[name="+formName+"]");
                 return (form.length ? form[0] : undefined);
         }
 
@@ -1453,7 +1463,7 @@
                     } else if(this.type == "file") {
 
                         for(var i = 0; i < this.files.length; i++)
-                            data.append(this.name, field.files[i]);
+                            data.append(this.name, this.files[i]);
 
                     } else data.append(this.name, this.value);
                 });
@@ -1628,7 +1638,7 @@
 
             dispatchEvent(new Event('transparent:'+switchLayout));
 
-            if($(dom).find("html").hasClass(Transparent.state.RELOAD))
+            if($(dom).find("html").hasClass(Transparent.state.RELOAD) || $(dom).find("html").hasClass(Transparent.state.DISABLE))
                 return window.location.reload();
 
             return Transparent.onLoad(uuid, dom, function() {
@@ -1652,7 +1662,7 @@
         // It is null when dev is pushing or replacing state
         var addNewState = !e.state;
         if (addNewState) {
-            
+
             if(history.state)
                 Transparent.setResponse(history.state.uuid, Transparent.html[0], Transparent.getScrollableElementXY());
 
@@ -1683,15 +1693,22 @@
     if (href != location.origin + location.pathname + location.hash)
         history.replaceState({uuid: uuidv4(), status: history.state ? history.state.status : 200, data:{}, method: history.state ? history.state.method : "GET", href: location.origin + location.pathname + location.hash}, '', location.origin + location.pathname + location.hash);
 
+    if($("html").hasClass(Transparent.state.DISABLE))
+        Settings.disable = true;
+
     // Overload onpopstate
     if(Settings.disable) {
 
+        if(Settings.debug) console.debug("Transparent is disabled..");
+
         var states    = Object.values(Transparent.state);
         var htmlClass = Array.from(($("html").attr("class") || "").split(" ")).filter(x => !states.includes(x));
         Transparent.html.removeClass(states).addClass(htmlClass.join(" ")+" "+Transparent.state.ROOT+" "+Transparent.state.READY+" "+Transparent.state.DISABLE);
 
     } else {
 
+        if(Settings.debug) console.debug("Transparent is running..");
+
         window.onpopstate   = __main__; // Onpopstate pop out straight to previous page.. this creates a jump while changing pages with hash..
         window.onhashchange = __main__;
 
@@ -1708,13 +1725,16 @@
                         if(this.type == "file") {
 
                             for(var i = 0; i < this.files.length; i++)
-                                formData.append(this.name, field.files[i]);
+                                formData.append(this.name+"["+i+"]", this.files[i].name+";"+this.files[i].size+";"+this.files[i].lastModified);
 
                         } else formData.append(this.name, this.value);
                     });
 
-                for (var [fieldName,fieldValue] of formData.entries())
-                    formDataBefore[fieldName] = fieldValue;
+                for (var [fieldName,fieldValue] of formData.entries()) {
+
+                    if(!fieldName.endsWith("[]") && fieldName != "undefined")
+                        formDataBefore[fieldName] = fieldValue;
+                }
             });
         });
 
@@ -1734,20 +1754,31 @@
                     if(this.type == "file") {
 
                         for(var i = 0; i < this.files.length; i++)
-                            formData.append(this.name, field.files[i]);
+                            formData.append(this.name+"["+i+"]", this.files[i].name+";"+this.files[i].size+";"+this.files[i].lastModified);
 
                     } else formData.append(this.name, this.value);
                 });
 
                 for (var [fieldName,fieldValue] of formData.entries()) {
-                    formDataAfter[fieldName] = fieldValue;
+
+                    if(!fieldName.endsWith("[]") && fieldName != "undefined")
+                        formDataAfter[fieldName] = fieldValue;
                 }
             });
 
-            var formDataBeforeKeys = Object.entries(formDataBefore).keys();
-            var formDataAfterKeys  = Object.entries(formDataAfter).keys();
+            var formDataBeforeKeys    = Object.keys(formDataBefore);
+            var formDataAfterKeys     = Object.keys(formDataAfter);
+            var formDataBeforeEntries = Object.entries(formDataBefore);
+            var formDataAfterEntries  = Object.entries(formDataAfter);
+            function compare(a, b) { return JSON.stringify(a) === JSON.stringify(b); }
+            function compareKeys(a, b) {
+
+                var aKeys = Object.keys(a).sort();
+                var bKeys = Object.keys(b).sort();
+                return JSON.stringify(aKeys) === JSON.stringify(bKeys);
+            }
 
-            if(formDataAfterKeys != formDataAfterKeys) preventDefault = true;
+            if(!compareKeys(formDataBeforeKeys, formDataAfterKeys)) preventDefault = true;
             else {
 
                 for (var [fieldName,fieldValueAfter] of Object.entries(formDataAfter)) {