From ba9857ad7d8af399206e4e0e1fada0de74af00bc Mon Sep 17 00:00:00 2001 From: lhy6305 Date: Fri, 18 Apr 2025 21:02:33 +0800 Subject: [PATCH] git auto update --- index.html | 4 ++-- js/0-loadfail.js | 14 ++++++++------ js/{0-jsloader.js => 1-jsloader.js} | 0 js/{0-jsloadentry.js => 2-jsloadentry.js} | 0 js/libmain.js | 14 +++++++------- js/libutil.js | 13 ++++++++++++- 6 files changed, 29 insertions(+), 16 deletions(-) rename js/{0-jsloader.js => 1-jsloader.js} (100%) rename js/{0-jsloadentry.js => 2-jsloadentry.js} (100%) diff --git a/index.html b/index.html index 66c71db..3fc7783 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,8 @@ - - + +
\ No newline at end of file diff --git a/js/0-loadfail.js b/js/0-loadfail.js index 27029d8..0e00340 100644 --- a/js/0-loadfail.js +++ b/js/0-loadfail.js @@ -3,16 +3,16 @@ (function() { var do_loadfail=function(msg) { var a=document.createElement("div"); - a.style.textAlign="center"; - a.style.display="inline-block"; + a.style.textAlign="left"; a.style.position="absolute"; a.style.zIndex="999999"; a.style.margin="auto"; a.style.color="rgba("+0xff+","+0xff+","+0x00+",1)"; - a.style.width="100%"; - a.style.verticalAlign="middle"; - a.style.outline="none"; - a.style.top="20vh"; + a.style.width="max-content"; + a.style.left="0"; + a.style.right="0"; + a.style.top="50%"; + a.style.transform="translateY(-50%)"; a.style.fontSize="20px"; a.style.lineHeight="25px"; a.style.whiteSpace="pre"; @@ -20,6 +20,8 @@ document.body.innerHTML=""; document.body.style.backgroundColor="rgba("+0x75+","+0x60+","+0x60+",1)"; + document.body.style.height="100vh"; + document.body.style.margin="0"; document.body.appendChild(a); }; diff --git a/js/0-jsloader.js b/js/1-jsloader.js similarity index 100% rename from js/0-jsloader.js rename to js/1-jsloader.js diff --git a/js/0-jsloadentry.js b/js/2-jsloadentry.js similarity index 100% rename from js/0-jsloadentry.js rename to js/2-jsloadentry.js diff --git a/js/libmain.js b/js/libmain.js index e4b5f28..7b5ea65 100644 --- a/js/libmain.js +++ b/js/libmain.js @@ -50,10 +50,10 @@ if(libmain.settings.use_fixed_aspect_ratio) { res=libutil.calcresize(document.body.clientWidth, document.body.clientHeight, libmain.settings.fixed_ratio); } - mainframe.style.width=res[0]+"px"; - mainframe.style.height=res[1]+"px"; - mainframe.style.left=res[2]+"px"; - mainframe.style.top=res[3]+"px"; + libmain.mainframe.style.width=res[0]+"px"; + libmain.mainframe.style.height=res[1]+"px"; + libmain.mainframe.style.left=res[2]+"px"; + libmain.mainframe.style.top=res[3]+"px"; }; window.addEventListener("resize", libmain.resize); @@ -73,13 +73,13 @@ libmain.stageroot.sortableChildren=true; libmain.render=function() { try { - libmain.renderer.render(libmain.stageroot); + libmain.renderer.render(libmain.stageroot1); } catch(e) { console.error(e); if(typeof loadfail=="function") { - loadfail(e.message+"\n"+e.stack); + loadfail(libutil.error2str(e)); } else { - window.alert(e.message+"\n"+e.stack); + window.alert(libutil.error2str(e)); } return; } diff --git a/js/libutil.js b/js/libutil.js index f5853dc..db51231 100644 --- a/js/libutil.js +++ b/js/libutil.js @@ -9,7 +9,7 @@ libutil.clamp=function(val, min, max) { if(window.EnableDebugMode) { if(max"; + var message=e.message||""; + var stack=e.stack||[""]; + return name+": "+message+"\n\nStack Trace: \n"+"- "+stack.trim().split("\n").join("\n- ")+"\n\nCheck the developer console for detailed information."; + }; + window.libutil=libutil; })(); \ No newline at end of file