重构代码, 优化加载js逻辑

This commit is contained in:
CounterFire2023 2023-09-22 12:03:18 +08:00
parent a480918c29
commit eb1a7c4414
3 changed files with 80 additions and 78 deletions

View File

@ -18,7 +18,7 @@ export class AppleClient {
}); });
} }
async initAppleClient() { async initAppleClient() {
await loadSingleScript([scripts[0]]); await loadScripts(scripts.map((script) => [script]));
this.initClient(); this.initClient();
} }
async login(funid) { async login(funid) {

View File

@ -24,7 +24,7 @@ export class GoogleClient {
console.log('google client init success'); console.log('google client init success');
} }
async initGoolgeClient() { async initGoolgeClient() {
await Promise.all([loadSingleScript([scripts[0]]), loadSingleScript([scripts[1]])]); await loadScripts(scripts.map((script) => [script]));
await this.initGApi(); await this.initGApi();
this.initTokenClient(SCOPES); this.initTokenClient(SCOPES);
} }

View File

@ -73,24 +73,26 @@
['assets/scripts/run_sample.js'], ['assets/scripts/run_sample.js'],
] ]
var loadScripts = async function (list, callback) { var loadScripts = function (list, refresh = false) {
var loaded = 0; var loaded = 0;
var loadNext = function () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// list[loaded][0] = list[loaded][0] + (list[loaded][0].indexOf("?") == -1 ? "?" : "&") + "t=" + Date.now(); var loadNext = function () {
if (refresh) {
list[loaded][0] = list[loaded][0] + (list[loaded][0].indexOf("?") == -1 ? "?" : "&") + "t=" + Date.now();
}
loadSingleScript(list[loaded]).then(() => { loadSingleScript(list[loaded]).then(() => {
loaded++; loaded++;
if (loaded >= list.length) { if (loaded >= list.length) {
resolve(); resolve && resolve();
} else { } else {
return loadNext(); return loadNext();
} }
}) })
})
}; };
loadNext(); loadNext();
})
}; };
loadScripts(scripts, ()=> {}) loadScripts(scripts);
</script> </script>
</body> </body>
</html> </html>