From 5881d9352c0acb50a9954b5866a483f9ae4fd61b Mon Sep 17 00:00:00 2001 From: Matei Stanca Date: Fri, 25 Oct 2024 10:24:59 -0400 Subject: [PATCH 1/2] Error thrown when bundle already defined now says which bundle. --- dist/loadjs.js | 2 +- dist/loadjs.min.js | 2 +- dist/loadjs.umd.js | 2 +- examples/assets/loadjs/loadjs.js | 2 +- examples/assets/loadjs/loadjs.min.js | 2 +- src/loadjs.js | 2 +- test/assets/loadjs/loadjs.js | 2 +- test/assets/loadjs/loadjs.min.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/loadjs.js b/dist/loadjs.js index a2655d1..ebe8735 100644 --- a/dist/loadjs.js +++ b/dist/loadjs.js @@ -246,7 +246,7 @@ function loadjs(paths, arg1, arg2) { // throw error if bundle is already defined if (bundleId) { if (bundleId in bundleIdCache) { - throw "LoadJS"; + throw "LoadJS: bundle '" + bundleId + "' is already defined!"; } else { bundleIdCache[bundleId] = true; } diff --git a/dist/loadjs.min.js b/dist/loadjs.min.js index 3b99906..afddae4 100644 --- a/dist/loadjs.min.js +++ b/dist/loadjs.min.js @@ -1 +1 @@ -loadjs=function(){var h=function(){},o={},c={},f={};function u(e,n){if(e){var t=f[e];if(c[e]=n,t)for(;t.length;)t[0](e,n),t.splice(0,1)}}function l(e,n){e.call&&(e={success:e}),n.length?(e.error||h)(n):(e.success||h)(e)}function p(t,r,i,s){var o,e,u,n=document,c=i.async,f=(i.numRetries||0)+1,l=i.before||h,a=t.replace(/[\?|#].*$/,""),d=t.replace(/^(css|img|module|nomodule)!/,"");if(s=s||0,/(^css!|\.css$)/.test(a))(u=n.createElement("link")).rel="stylesheet",u.href=d,(o="hideFocus"in u)&&u.relList&&(o=0,u.rel="preload",u.as="style");else if(/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(a))(u=n.createElement("img")).src=d;else if((u=n.createElement("script")).src=d,u.async=void 0===c||c,e="noModule"in u,/^module!/.test(a)){if(!e)return r(t,"l");u.type="module"}else if(/^nomodule!/.test(a)&&e)return r(t,"l");!(u.onload=u.onerror=u.onbeforeload=function(e){var n=e.type[0];if(o)try{u.sheet.cssText.length||(n="e")}catch(e){18!=e.code&&(n="e")}if("e"==n){if((s+=1) Date: Fri, 8 Nov 2024 12:46:33 -0500 Subject: [PATCH 2/2] Only include bundleId in error thrown to keep size down. --- dist/loadjs.js | 2 +- dist/loadjs.min.js | 2 +- dist/loadjs.umd.js | 2 +- examples/assets/loadjs/loadjs.js | 2 +- examples/assets/loadjs/loadjs.min.js | 2 +- src/loadjs.js | 2 +- test/assets/loadjs/loadjs.js | 2 +- test/assets/loadjs/loadjs.min.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/loadjs.js b/dist/loadjs.js index ebe8735..5fc484d 100644 --- a/dist/loadjs.js +++ b/dist/loadjs.js @@ -246,7 +246,7 @@ function loadjs(paths, arg1, arg2) { // throw error if bundle is already defined if (bundleId) { if (bundleId in bundleIdCache) { - throw "LoadJS: bundle '" + bundleId + "' is already defined!"; + throw bundleId; } else { bundleIdCache[bundleId] = true; } diff --git a/dist/loadjs.min.js b/dist/loadjs.min.js index afddae4..382a191 100644 --- a/dist/loadjs.min.js +++ b/dist/loadjs.min.js @@ -1 +1 @@ -loadjs=function(){var h=function(){},o={},c={},l={};function u(e,n){if(e){var t=l[e];if(c[e]=n,t)for(;t.length;)t[0](e,n),t.splice(0,1)}}function f(e,n){e.call&&(e={success:e}),n.length?(e.error||h)(n):(e.success||h)(e)}function p(t,r,i,s){var o,e,u,n=document,c=i.async,l=(i.numRetries||0)+1,f=i.before||h,a=t.replace(/[\?|#].*$/,""),d=t.replace(/^(css|img|module|nomodule)!/,"");if(s=s||0,/(^css!|\.css$)/.test(a))(u=n.createElement("link")).rel="stylesheet",u.href=d,(o="hideFocus"in u)&&u.relList&&(o=0,u.rel="preload",u.as="style");else if(/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(a))(u=n.createElement("img")).src=d;else if((u=n.createElement("script")).src=d,u.async=void 0===c||c,e="noModule"in u,/^module!/.test(a)){if(!e)return r(t,"l");u.type="module"}else if(/^nomodule!/.test(a)&&e)return r(t,"l");!(u.onload=u.onerror=u.onbeforeload=function(e){var n=e.type[0];if(o)try{u.sheet.cssText.length||(n="e")}catch(e){18!=e.code&&(n="e")}if("e"==n){if((s+=1)