修复打开主代码报错的问题,修复所有js加载失败均弹窗的问题
This commit is contained in:
parent
459df4e0a4
commit
25aee55493
|
@ -51,16 +51,18 @@ function generateImportFunction(type, pathParser) {
|
||||||
};
|
};
|
||||||
let script = createScript();
|
let script = createScript();
|
||||||
script.onerror = (e) => {
|
script.onerror = (e) => {
|
||||||
if (path.endsWith('.js')) {
|
if (path.endsWith('.js') && window.isSecureContext) {
|
||||||
path = path.slice(0, -3) + '.ts';
|
path = path.slice(0, -3) + '.ts';
|
||||||
script.remove();
|
script.remove();
|
||||||
let ts = createScript();
|
let ts = createScript();
|
||||||
ts.onerror = (e2) => {
|
ts.onerror = (e2) => {
|
||||||
console.error(`扩展《${name}》加载失败`,e,e2);
|
if (lib.path.basename(path) === 'extension.js' && lib.path.dirname(path).endsWith('/extension')) {
|
||||||
let remove = confirm(`扩展《${name}》加载失败,是否移除此扩展?此操作不会移除目录下的文件。`);
|
console.error(`扩展《${name}》加载失败`, e, e2);
|
||||||
if(remove){
|
let remove = confirm(`扩展《${name}》加载失败,是否移除此扩展?此操作不会移除目录下的文件。`);
|
||||||
lib.config.extensions.remove(name);
|
if (remove) {
|
||||||
game.saveConfig('extensions',lib.config.extensions);
|
lib.config.extensions.remove(name);
|
||||||
|
game.saveConfig('extensions', lib.config.extensions);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
resolve(['error', ts]);
|
resolve(['error', ts]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5906,7 +5906,7 @@ class Create extends Uninstantable {
|
||||||
else {
|
else {
|
||||||
if (!window.CodeMirror) {
|
if (!window.CodeMirror) {
|
||||||
import('../../game/codemirror.js').then(() => {
|
import('../../game/codemirror.js').then(() => {
|
||||||
lib.codeMirrorReady(node, editor);
|
lib.codeMirrorReady(node, this.editor);
|
||||||
});
|
});
|
||||||
lib.init.css(lib.assetURL + 'layout/default', 'codemirror');
|
lib.init.css(lib.assetURL + 'layout/default', 'codemirror');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue