Monaco-lataus refaktoroitu: singleton Promise, parempi virheenkäsittely
initMonaco palauttaa nyt aina saman Promisen (ei moninkertaista latausta). AMD-loader virheet ja CDN-virheet napataan ja logitetaan. monacoLoaded-lippu korvattu Promise-pohjaisella tilanhallinnalla. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -57,7 +57,6 @@ import AgentBar from "../components/AgentBar.astro";
|
||||
}
|
||||
|
||||
// === Globaalit tilat ===
|
||||
let monacoLoaded = false;
|
||||
|
||||
// === Tab switching ===
|
||||
window.switchTab = function(tab) {
|
||||
@@ -545,26 +544,29 @@ import AgentBar from "../components/AgentBar.astro";
|
||||
// === Monaco Editor (lazy load) ===
|
||||
window.MonacoEnvironment = { getWorkerUrl: () => `data:text/javascript,self.MonacoEnvironment={baseUrl:'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/'};importScripts('https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs/base/worker/workerMain.js')` };
|
||||
|
||||
async function initMonaco() {
|
||||
if (monacoLoaded) return;
|
||||
monacoLoaded = true;
|
||||
await new Promise(r => {
|
||||
let _monacoInitPromise = null;
|
||||
function initMonaco() {
|
||||
if (_monacoInitPromise) return _monacoInitPromise;
|
||||
_monacoInitPromise = new Promise((resolve, reject) => {
|
||||
const s = document.createElement('script');
|
||||
s.src = 'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs/loader.js';
|
||||
s.onerror = () => reject(new Error('Monaco loader lataus epäonnistui'));
|
||||
s.onload = () => {
|
||||
require.config({ paths: { vs: 'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs' }});
|
||||
require(['vs/editor/editor.main'], () => {
|
||||
window.monaco = monaco; // Varmistetaan globaali
|
||||
r();
|
||||
});
|
||||
window.monaco = monaco;
|
||||
window._monaco = monaco.editor.create(document.getElementById('monaco-container'), {
|
||||
value: '// Valitse tiedosto tai generoi projekti\n',
|
||||
language: 'plaintext', theme: 'vs-dark', fontSize: 14,
|
||||
minimap: { enabled: false }, automaticLayout: true, padding: { top: 10 }
|
||||
});
|
||||
console.log('[Monaco] Valmis');
|
||||
resolve();
|
||||
}, (err) => reject(new Error('Monaco AMD load: ' + err)));
|
||||
};
|
||||
document.head.appendChild(s);
|
||||
});
|
||||
window._monaco = window.monaco.editor.create(document.getElementById('monaco-container'), {
|
||||
value: '// Valitse tiedosto tai generoi projekti\n',
|
||||
language: 'plaintext', theme: 'vs-dark', fontSize: 14,
|
||||
minimap: { enabled: false }, automaticLayout: true, padding: { top: 10 }
|
||||
});
|
||||
return _monacoInitPromise;
|
||||
}
|
||||
|
||||
window._editorModels = {};
|
||||
@@ -572,7 +574,7 @@ import AgentBar from "../components/AgentBar.astro";
|
||||
|
||||
window.openInEditor = async function(files) {
|
||||
switchTab('editor');
|
||||
await initMonaco();
|
||||
try { await initMonaco(); } catch(e) { console.error('Monaco-virhe:', e); return; }
|
||||
const m = window.monaco;
|
||||
if (!m) { console.error('Monaco ei latautunut'); return; }
|
||||
for (const [name,code] of Object.entries(files)) {
|
||||
|
||||
Reference in New Issue
Block a user