From a2beb71de0c396c44d3ebe1443548671e6dbf18e Mon Sep 17 00:00:00 2001
From: Lubber <c64@lubber.de>
Date: Tue, 17 Oct 2017 21:28:27 +0200
Subject: [PATCH] Also look for @import url in stylesheets

---
 stackload.js     | 30 +++++++++++++++++++++++++-----
 stackload.min.js |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/stackload.js b/stackload.js
index b80809c..e80c7dd 100644
--- a/stackload.js
+++ b/stackload.js
@@ -28,11 +28,13 @@
             eT.removeEventListener("error", stackLoadError);
             eT.removeEventListener("load", stackLoadDone);
             currentLoadIndex++;
-
             if(eT.jsonp && eT.parentNode) {
                 eT.parentNode.removeChild(eT);
             }
             if(!stopAll){
+                if(eT.href) {
+                    searchCssImport(document.styleSheets[document.styleSheets.length-1]);
+                }
                 if(currentLoadIndex===callBacks[0].doneIndex) {
                     callBacks[0].success();
                     callBacks.shift();
@@ -78,6 +80,9 @@
             catch (e) {}
         },
         setup = function(stack){
+            if(typeof stack === 'undefined') {
+                return;
+            }
             if(typeof stack === 'string' || stack.url){
                 stack = {files:[stack]};
             } else if(Array.isArray(stack)){
@@ -119,6 +124,7 @@
                 if(cL>0){
                     fullStack = fullStack.concat(cleanedStack);
                     var fL = fullStack.length;
+
                     if (typeof stack.error !== 'function') {
                         stack.error = function(){};
                     }
@@ -134,20 +140,34 @@
                     stack.success();
                 }
             }
+        },
+        searchCssImport = function(styleSheet) {
+            if (styleSheet.cssRules) {
+                for (var j = 0, jl = styleSheet.cssRules.length; j < jl; j++) {
+                    if (styleSheet.cssRules[j].href && registry.indexOf(styleSheet.cssRules[j].href)===-1) {
+                        registry.push(styleSheet.cssRules[j].href);
+                    }
+                }
+            }
         }
     ;
     window.stackLoad = function(stack) {
         stopAll=false;
         if(registry.length===0){
-            var elements = document.querySelectorAll('link,script'),i;
+            var elements = document.querySelectorAll('link,script'),i,il;
 //forEach on querySelectorAll not supported in IE/Edge, thus usual for loop
-            for (i=0;i<elements.length;i++) {
-                if(elements[i].src) {
+            for (i=0,il=elements.length;i<il;i++) {
+                if(elements[i].src && registry.indexOf(elements[i].src)===-1) {
                     registry.push(elements[i].src);
-                } else if (elements[i].href) {
+                } else if (elements[i].href && registry.indexOf(elements[i].href)===-1) {
                     registry.push(elements[i].href);
                 }
             }
+//same for styleSheets, search for @import
+            var cssStyles = document.styleSheets;
+            for (i=0,il=cssStyles.length;i<il;i++) {
+                searchCssImport(cssStyles[i]);
+            }
         }
         setup(stack);
         return {
diff --git a/stackload.min.js b/stackload.min.js
index d2878fe..cc499ac 100644
--- a/stackload.min.js
+++ b/stackload.min.js
@@ -6,4 +6,4 @@
  * @license    GPLv3 https://gitlab.com/lubber/stackload/blob/master/LICENSE
 
  */
-!function(window,document){var registry=[],fullStack=[],currentLoadIndex=0,callBacks=[],stopAll=!1,stackLoadError=function(e){window.console&&console.error("[StackLoad Error] Missing file: "+(e.target.src?e.target.src:e.target.href)),!1===callBacks[0].error(e)&&(stopAll=!0);var t=e.target;t.parentNode.removeChild(t),stackLoadDone(e)},stackLoadDone=function(e){var t=e.target;if(t.removeEventListener("error",stackLoadError),t.removeEventListener("load",stackLoadDone),currentLoadIndex++,t.jsonp&&t.parentNode&&t.parentNode.removeChild(t),stopAll){var r=callBacks[0].doneIndex-currentLoadIndex;r>0&&(fullStack.splice(currentLoadIndex,r),callBacks.shift(),callBacks.forEach(function(e,t,n){n[t].doneIndex-=r}))}else currentLoadIndex===callBacks[0].doneIndex&&(callBacks[0].success(),callBacks.shift()),currentLoadIndex===fullStack.length||stopAll||loadSingle()},loadSingle=function(){var o=fullStack[currentLoadIndex];try{if(!o.check||void 0===eval(o.check)){var element;o.type&&"css"===o.type?(element=document.createElement("link"),element.type="text/css",element.rel="stylesheet",element.href=o.url):(element=document.createElement("script"),element.type="text/javascript",element.src=o.url,element.async=!1,o.type&&"jsonp"===o.type&&(element.jsonp=!0)),document.head.appendChild(element),element.addEventListener("load",stackLoadDone),element.addEventListener("error",stackLoadError)}}catch(e){}},setup=function(e){if("string"==typeof e||e.url?e={files:[e]}:Array.isArray(e)&&(e={files:e}),e.files){var t=[];("string"==typeof e.files||e.files.url)&&(e.files=[e.files]),e.files.forEach(function(e){if("string"==typeof e&&(e={url:e}),e.url&&-1===registry.indexOf(e.url)){if(!e.type){var r=e.url.match(/\.([0-9a-zA-Z]+)(?:[?#]|$)/i);r&&(e.type=r[1].toLowerCase())}if("jsonp"===e.type.toLowerCase()){var n=(new Date).getTime();e.url.match(/\?/)?e.url+="&_="+n:e.url+="?_="+n}t.push(e),registry.push(e.url)}});var r=t.length;if("function"!=typeof e.success&&(e.success=function(){}),r>0){var n=(fullStack=fullStack.concat(t)).length;"function"!=typeof e.error&&(e.error=function(){}),callBacks.push({doneIndex:n,success:e.success,error:e.error}),currentLoadIndex===n-r&&loadSingle()}else e.success()}};window.stackLoad=function(e){if(stopAll=!1,0===registry.length){var t,r=document.querySelectorAll("link,script");for(t=0;t<r.length;t++)r[t].src?registry.push(r[t].src):r[t].href&&registry.push(r[t].href)}return setup(e),{then:function(e){return setup(e),this}}}}(window,document);
\ No newline at end of file
+!function(window,document){var registry=[],fullStack=[],currentLoadIndex=0,callBacks=[],stopAll=!1,stackLoadError=function(e){window.console&&console.error("[StackLoad Error] Missing file: "+(e.target.src?e.target.src:e.target.href)),!1===callBacks[0].error(e)&&(stopAll=!0);var r=e.target;r.parentNode.removeChild(r),stackLoadDone(e)},stackLoadDone=function(e){var r=e.target;if(r.removeEventListener("error",stackLoadError),r.removeEventListener("load",stackLoadDone),currentLoadIndex++,r.jsonp&&r.parentNode&&r.parentNode.removeChild(r),stopAll){var t=callBacks[0].doneIndex-currentLoadIndex;t>0&&(fullStack.splice(currentLoadIndex,t),callBacks.shift(),callBacks.forEach(function(e,r,s){s[r].doneIndex-=t}))}else r.href&&searchCssImport(document.styleSheets[document.styleSheets.length-1]),currentLoadIndex===callBacks[0].doneIndex&&(callBacks[0].success(),callBacks.shift()),currentLoadIndex===fullStack.length||stopAll||loadSingle()},loadSingle=function(){var o=fullStack[currentLoadIndex];try{if(!o.check||void 0===eval(o.check)){var element;o.type&&"css"===o.type?(element=document.createElement("link"),element.type="text/css",element.rel="stylesheet",element.href=o.url):(element=document.createElement("script"),element.type="text/javascript",element.src=o.url,element.async=!1,o.type&&"jsonp"===o.type&&(element.jsonp=!0)),document.head.appendChild(element),element.addEventListener("load",stackLoadDone),element.addEventListener("error",stackLoadError)}}catch(e){}},setup=function(e){if(void 0!==e&&("string"==typeof e||e.url?e={files:[e]}:Array.isArray(e)&&(e={files:e}),e.files)){var r=[];("string"==typeof e.files||e.files.url)&&(e.files=[e.files]),e.files.forEach(function(e){if("string"==typeof e&&(e={url:e}),e.url&&-1===registry.indexOf(e.url)){if(!e.type){var t=e.url.match(/\.([0-9a-zA-Z]+)(?:[?#]|$)/i);t&&(e.type=t[1].toLowerCase())}if("jsonp"===e.type.toLowerCase()){var s=(new Date).getTime();e.url.match(/\?/)?e.url+="&_="+s:e.url+="?_="+s}r.push(e),registry.push(e.url)}});var t=r.length;if("function"!=typeof e.success&&(e.success=function(){}),t>0){var s=(fullStack=fullStack.concat(r)).length;"function"!=typeof e.error&&(e.error=function(){}),callBacks.push({doneIndex:s,success:e.success,error:e.error}),currentLoadIndex===s-t&&loadSingle()}else e.success()}},searchCssImport=function(e){if(e.cssRules)for(var r=0,t=e.cssRules.length;r<t;r++)e.cssRules[r].href&&-1===registry.indexOf(e.cssRules[r].href)&&registry.push(e.cssRules[r].href)};window.stackLoad=function(e){if(stopAll=!1,0===registry.length){var r,t,s=document.querySelectorAll("link,script");for(r=0,t=s.length;r<t;r++)s[r].src&&-1===registry.indexOf(s[r].src)?registry.push(s[r].src):s[r].href&&-1===registry.indexOf(s[r].href)&&registry.push(s[r].href);var n=document.styleSheets;for(r=0,t=n.length;r<t;r++)searchCssImport(n[r])}return setup(e),{then:function(e){return setup(e),this}}}}(window,document);
\ No newline at end of file