@glitchr/transparent 1.0.26 → 1.0.28

package/package.json

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

package/src/js/transparent.js

@@ -906,6 +906,7 @@
         var head = $(dom).find("head").html();
         var body = $(dom).find("body").html();
 
+        console.log(head, body);
         if(head == undefined || body == "undefined") {
             
             $(Settings.identifier).html("<div class='error'></div>");
@@ -1178,14 +1179,19 @@
         // Transfert attributes
         Transparent.transferAttributes(dom);
 
-        // Replace head.. (@TODO keep ordering, by adding after.. last node probed)
+        // Replace head..
         var head = $(dom).find("head");
         $("head").children().each(function() {
 
             var el   = this;
             var found = false;
 
-            head.children().each(function() { found |= this.isEqualNode(el); });
+            head.children().each(function() {
+
+                found = this.isEqualNode(el);
+                return !found;
+            });
+
             if(!found) this.remove();
         });
 
@@ -1202,30 +1208,16 @@
             }
         });
 
-        // Replace body end (@TODO keep ordering, by adding after.. last node probed)
         var bodyScript = $(dom).find("body > script");
-        $("body").find("script").each(function() {
-           
-            var el   = this;
-            var found = false;
+            bodyScript.each(function() {
 
-            bodyScript.each(function() { found |= this.isEqualNode(el); });
-            if(!found) this.remove();
-        });
+                var el   = this;
+                var found = false;
 
-        bodyScript.each(function() {
-
-            var el   = this;
-            var found = false;
+                $("body").children().each(function() { found |= this.isEqualNode(el); });
+                if(!found) $("body").append(this);
+            });
 
-            $("body").find("script").each(function() { found |= this.isEqualNode(el); });
-            if(!found) {
-                
-                if(this.tagName != "SCRIPT" || Settings["global_code"] == true) $("body").append(this.cloneNode(true));
-                else $("body").append(this);
-            }
-        });
-        
         // Replace canvases..
         Transparent.replaceCanvases(dom);
 
@@ -1253,7 +1245,8 @@
         oldPage.remove();
 
         if(Settings["global_code"] == true) Transparent.evalScript($(page)[0]);
-        dispatchEvent(new Event('DOMContentLoaded'));
+        document.dispatchEvent(new Event('DOMContentLoaded'));
+        window.dispatchEvent(new Event('DOMContentLoaded'));
 
         Transparent.addLayout();
 
@@ -1286,21 +1279,19 @@
         }
 
         $('head').append(function() {
-            $('body').append(function() {
 
-                $(Settings.identifier).append(function() {
+            $(Settings.identifier).append(function() {
 
-                    setTimeout(function() {
+                setTimeout(function() {
 
-                        // Callback if needed, or any other actions
-                        callback();
+                    // Callback if needed, or any other actions
+                    callback();
 
-                        // Trigger onload event
-                        dispatchEvent(new Event('transparent:load'));
-                        dispatchEvent(new Event('load'));
+                    // Trigger onload event
+                    dispatchEvent(new Event('transparent:load'));
+                    dispatchEvent(new Event('load'));
 
-                    }.bind(this), 1);
-                });
+                }.bind(this), 1);
             });
         });
     }
@@ -1427,7 +1418,7 @@
 
         var form   = target != undefined && target.tagName == "FORM" ? target : undefined;
         if (form) {
-            data = $(form).serialize();
+            data = new FormEvent(form);
             $(form).find(':submit').attr('disabled', 'disabled');
         }
 
@@ -1550,7 +1541,7 @@
             // From here the page is valid..
             // so the new page is added to history..
             if(xhr)
-                history.pushState({uuid: uuid, status:status, method: method, data: data, href: responseURL}, '', responseURL);
+                history.pushState({uuid: uuid, status:status, method: method, data: {}, href: responseURL}, '', responseURL);
 
             var dom = new DOMParser().parseFromString(responseText, "text/html");
             if(status != 200) // Blatant error received..
@@ -1630,7 +1621,9 @@
                 url: url.href,
                 type: type,
                 data: data,
-                dataType: 'html',
+                cache: false,
+                contentType: false,
+                processData: false,
                 headers: Settings["headers"] || {},
                 xhr: function () { return xhr; },
                 success: function (html, status, request) { return handleResponse(uuid, request.status, type, data, xhr, request); },