@glitchr/transparent 1.0.33 → 1.0.35

package/package.json

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

package/src/js/transparent.js

@@ -910,7 +910,6 @@
         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>");
@@ -1180,125 +1179,139 @@
         window.previousLocation = window.location.toString();
         if(callback === null) callback = function() {};
 
-        // Transfert attributes
-        Transparent.transferAttributes(dom);
+        activeInRemainingTime = activeInRemainingTime - (Date.now() - activeInTime);
+        setTimeout(function() {
 
-        // Replace head..
-        var head = $(dom).find("head");
-        $("head").children().each(function() {
+            // Transfert attributes
+            Transparent.transferAttributes(dom);
 
-            var el   = this;
-            var found = false;
+            // Replace head..
+            var head = $(dom).find("head");
+            $("head").children().each(function() {
 
-            head.children().each(function() {
+                var el   = this;
+                var found = false;
 
-                found = this.isEqualNode(el);
-                return !found;
+                head.children().each(function() {
+
+                    found = this.isEqualNode(el);
+                    return !found;
+                });
+
+                if(!found) this.remove();
             });
 
-            if(!found) this.remove();
-        });
+            head.children().each(function() {
 
-        head.children().each(function() {
+                var el   = this;
+                var found = false;
 
-            var el   = this;
-            var found = false;
+                $("head").children().each(function() { found |= this.isEqualNode(el); });
+                if(!found) {
+        
+            
+                    if(this.tagName != "SCRIPT" || Settings["global_code"] == true) {
+                    
+                        $("head").append(this.cloneNode(true));
+                    
+                    } else {
 
-            $("head").children().each(function() { found |= this.isEqualNode(el); });
-            if(!found) {
+                        $("head").append(this);
+                    }
+                }
+            });
 
-                if(this.tagName != "SCRIPT" || Settings["global_code"] == true) $("head").append(this.cloneNode(true));
-                else $("head").append(this);
-            }
-        });
+            var bodyScript = $(dom).find("body > script");
+            bodyScript.each(function() {
 
-        var bodyScript = $(dom).find("body > script");
-        bodyScript.each(function() {
+                var el   = this;
+                var found = false;
 
-            var el   = this;
-            var found = false;
+                $("body").children().each(function() { found |= this.isEqualNode(el); });
+                if(!found) {
 
-            $("body").children().each(function() { found |= this.isEqualNode(el); });
-            if(!found) $("body").append(this);
-        });
+                    if(this.tagName != "SCRIPT" || Settings["global_code"] == true) {
+                        $("body").append(this.cloneNode(true));
+                    } else {
+                        $("body").append(this);
+                    }
+                }
+            });
 
-        // Replace canvases..
-        Transparent.replaceCanvases(dom);
+            // Replace canvases..
+            Transparent.replaceCanvases(dom);
 
-        // Extract page block to be loaded
-        var page = $(dom).find(Settings.identifier);
-        if(dom == undefined || page == undefined) window.reload(); // Error a posteriori
+            // Extract page block to be loaded
+            var page = $(dom).find(Settings.identifier);
+            if(dom == undefined || page == undefined) window.reload(); // Error a posteriori
 
-        var oldPage = $(Settings.identifier);
+            var oldPage = $(Settings.identifier);
 
-        // Make sure name/layout keep the same after a page change (tolerance for POST or GET requests)
-        if(oldPage.attr("data-layout") != undefined && page.attr("data-layout") != undefined) {
+            // Make sure name/layout keep the same after a page change (tolerance for POST or GET requests)
+            if(oldPage.attr("data-layout") != undefined && page.attr("data-layout") != undefined) {
 
-            var switchLayout = Transparent.state.SWITCH.replace("X", page.attr("data-layout")).replace("Y", oldPage.attr("data-layout"));
-            page.attr("data-layout-prev", oldPage.attr("data-layout"));
-        }
+                var switchLayout = Transparent.state.SWITCH.replace("X", page.attr("data-layout")).replace("Y", oldPage.attr("data-layout"));
+                page.attr("data-layout-prev", oldPage.attr("data-layout"));
+            }
 
-        var states = Object.values(Transparent.state);
-        var     htmlClass = Array.from(($(dom).find("html").attr("class") || "").split(" ")).filter(x => !states.includes(x));
-        var  oldHtmlClass = Array.from(($(Transparent.html).attr("class") || "").split(" "));
-        var removeHtmlClass = oldHtmlClass.filter(x => !htmlClass.includes(x) && switchLayout != x && !states.includes(x));
+            var states = Object.values(Transparent.state);
+            var     htmlClass = Array.from(($(dom).find("html").attr("class") || "").split(" ")).filter(x => !states.includes(x));
+            var  oldHtmlClass = Array.from(($(Transparent.html).attr("class") || "").split(" "));
+            var removeHtmlClass = oldHtmlClass.filter(x => !htmlClass.includes(x) && switchLayout != x && !states.includes(x));
 
-        Transparent.html.removeClass(removeHtmlClass).addClass(htmlClass);
-        $(page).insertBefore(oldPage);
+            Transparent.html.removeClass(removeHtmlClass).addClass(htmlClass);
+            $(page).insertBefore(oldPage);
 
-        oldPage.remove();
+            oldPage.remove();
 
-        if(Settings["global_code"] == true) Transparent.evalScript($(page)[0]);
-        document.dispatchEvent(new Event('DOMContentLoaded'));
-        window.dispatchEvent(new Event('DOMContentLoaded'));
+            if(Settings["global_code"] == true) Transparent.evalScript($(page)[0]);
+            document.dispatchEvent(new Event('DOMContentLoaded'));
+              window.dispatchEvent(new Event('DOMContentLoaded'));
 
-        Transparent.addLayout();
+            Transparent.addLayout();
 
-        if(scrollTo) {
+            if(scrollTo) {
 
-            // Go back to top of the page..
-            var scrollableElements   = Transparent.getScrollableElement();
-            var scrollableElementsXY = Transparent.getResponsePosition(uuid);
+                // Go back to top of the page..
+                var scrollableElements   = Transparent.getScrollableElement();
+                var scrollableElementsXY = Transparent.getResponsePosition(uuid);
 
-            for(i = 0; i < scrollableElements.length; i++) {
+                for(i = 0; i < scrollableElements.length; i++) {
 
-                var el = scrollableElements[i];
-                var positionXY = undefined;
+                    var el = scrollableElements[i];
+                    var positionXY = undefined;
 
-                if(scrollableElementsXY.length == scrollableElements.length)
-                    positionXY = scrollableElementsXY[i] || undefined;
+                    if(scrollableElementsXY.length == scrollableElements.length)
+                        positionXY = scrollableElementsXY[i] || undefined;
 
-                if(el == window || el == document.documentElement) {
+                    if(el == window || el == document.documentElement) {
 
-                    if(positionXY != undefined) Transparent.scrollTo({top:positionXY[0], left:positionXY[1], duration:0});
-                    else if (location.hash) Transparent.scrollToHash(location.hash, {duration:0});
-                    else Transparent.scrollTo({top:0, left:0, duration:0});
+                        if(positionXY != undefined) Transparent.scrollTo({top:positionXY[0], left:positionXY[1], duration:0});
+                        else if (location.hash) Transparent.scrollToHash(location.hash, {duration:0});
+                        else Transparent.scrollTo({top:0, left:0, duration:0});
 
-                } else {
+                    } else {
 
-                    if(positionXY != undefined) Transparent.scrollTo({top:positionXY[0], left:positionXY[1], duration:0}, el);
-                    else Transparent.scrollTo({top:0, left:0, duration:0}, el);
+                        if(positionXY != undefined) Transparent.scrollTo({top:positionXY[0], left:positionXY[1], duration:0}, el);
+                        else Transparent.scrollTo({top:0, left:0, duration:0}, el);
+                    }
                 }
             }
-        }
-
-        $('head').append(function() {
 
-            $(Settings.identifier).append(function() {
+            $('head').append(function() {
 
-                activeInRemainingTime = activeInRemainingTime - (Date.now() - activeInTime);
-                setTimeout(function() {
+                $(Settings.identifier).append(function() {
 
-                    // Callback if needed, or any other actions
-                    callback();
-
-                    // Trigger onload event
-                    dispatchEvent(new Event('transparent:load'));
-                    dispatchEvent(new Event('load'));
+                        // Callback if needed, or any other actions
+                        callback();
 
-                }.bind(this), activeInRemainingTime > 0 ? activeInRemainingTime : 1);
+                        // Trigger onload event
+                        dispatchEvent(new Event('transparent:load'));
+                        dispatchEvent(new Event('load'));
+                });
             });
-        });
+
+        }.bind(this), activeInRemainingTime > 0 ? activeInRemainingTime : 1);
     }
 
     function uuidv4() {