@glitchr/transparent 1.0.47 → 1.0.49

package/package.json

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

package/src/js/transparent.js

@@ -1453,20 +1453,25 @@
         if (form) {
 
             data = new FormData();
-            var formInput = $(form).find(":input, [name^='"+form.name+"\[']");
-                formInput.each(function() {
+            var formAmbiguity = $("form[name='"+form.name+"']").length > 1;
+            
+            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") {
+                if(this.tagName == "BUTTON") {
 
-                        if(this == e.target) data.append(this.name, this.value);
+                    if(this == e.target) data.append(this.name, this.value);
 
-                    } else if(this.type == "file") {
+                } else if(this.type == "file") {
 
-                        for(var i = 0; i < this.files.length; i++)
-                            data.append(this.name, this.files[i]);
+                    for(var i = 0; i < this.files.length; i++)
+                        data.append(this.name, this.files[i]);
 
-                    } else data.append(this.name, this.value);
-                });
+                } else data.append(this.name, this.value);
+            });
 
             // Force page reload
             formSubmission = true; // mark as form submission
@@ -1713,7 +1718,7 @@
         window.onhashchange = __main__;
 
         var formDataBefore = {};
-        $(window).on("DOMContentLoaded", function() {
+        $(window).on("load", function() {
 
             formDataBefore = {};
             $("form").each(function() {
@@ -1743,6 +1748,8 @@
             if(formSubmission) return; // Do not display on form submission
             if(Settings.disable) return;
 
+            if(e.currentTarget == window) return;
+
             var preventDefault = false;
             var formDataAfter = [];
             $("form").each(function() {
@@ -1770,15 +1777,15 @@
             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) {
+            function same(a, b) { return JSON.stringify(a) === JSON.stringify(b); }
+            function sameKeys(a, b) {
 
                 var aKeys = Object.keys(a).sort();
                 var bKeys = Object.keys(b).sort();
                 return JSON.stringify(aKeys) === JSON.stringify(bKeys);
             }
 
-            if(!compareKeys(formDataBeforeKeys, formDataAfterKeys)) preventDefault = true;
+            if(!sameKeys(formDataBeforeKeys, formDataAfterKeys)) preventDefault = true;
             else {
 
                 for (var [fieldName,fieldValueAfter] of Object.entries(formDataAfter)) {
@@ -1789,7 +1796,9 @@
                         if(!fieldValueAfter instanceof File) preventDefault = true;
                         else if (fieldValueBefore.size != fieldValueAfter.size) preventDefault = true;
 
-                    } else if(fieldValueBefore != fieldValueAfter) preventDefault = true;
+                    } else if(fieldValueBefore != fieldValueAfter) {
+                        preventDefault = true;
+                    }
                 }
             }