kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed JavaScript issue when loading scripts dynamically which caused only the first script to be loaded

Browse Source
This commit is contained in:
Shaun Walker 2020-11-05 08:50:52 -05:00
parent 23a35cf3c4
commit f976910730
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Oqtane.Server/wwwroot/js/interop.js
View File

@ -208,14 +208,15 @@ Oqtane.Interop = {
bundles.push(scripts[s].bundle); bundles.push(scripts[s].bundle);
} }
} }
const urls = []; const promises = [];
for (let b = 0; b < bundles.length; b++) { for (let b = 0; b < bundles.length; b++) {
const urls = [];
for (let s = 0; s < scripts.length; s++) { for (let s = 0; s < scripts.length; s++) {
if (scripts[s].bundle === bundles[b]) { if (scripts[s].bundle === bundles[b]) {
urls.push(scripts[s].href); urls.push(scripts[s].href);
} }
} }
const promise = new Promise((resolve, reject) => { promises.push(new Promise((resolve, reject) => {
if (loadjs.isDefined(bundles[b])) { if (loadjs.isDefined(bundles[b])) {
resolve(true); resolve(true);
} }
@ -237,9 +238,10 @@ Oqtane.Interop = {
.then(function () { resolve(true) }) .then(function () { resolve(true) })
.catch(function (pathsNotFound) { reject(false) }); .catch(function (pathsNotFound) { reject(false) });
} }
}); }));
await promise; }
urls = []; if (promises.length !== 0) {
await Promise.all(promises);
} }
}, },
getAbsoluteUrl: function (url) { getAbsoluteUrl: function (url) {