BuboBubo/topos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for universe loading

Browse Source
This commit is contained in:
Raphaël Forment
2023-08-23 18:39:34 +02:00
parent 5bc6eca18a
commit b76a389db0
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main.ts
View File

@ -6,7 +6,7 @@ import { markdown } from "@codemirror/lang-markdown";
import { Extension, Prec } from "@codemirror/state"; import { Extension, Prec } from "@codemirror/state";
import { indentWithTab } from "@codemirror/commands"; import { indentWithTab } from "@codemirror/commands";
import { vim } from "@replit/codemirror-vim"; import { vim } from "@replit/codemirror-vim";
import { AppSettings } from "./AppSettings"; import { AppSettings, Universe } from "./AppSettings";
import { editorSetup } from "./EditorSetup"; import { editorSetup } from "./EditorSetup";
import { documentation } from "./Documentation"; import { documentation } from "./Documentation";
import { EditorView } from "codemirror"; import { EditorView } from "codemirror";
@ -573,11 +573,16 @@ export class Editor {
// Loading from URL bar // Loading from URL bar
let url = new URLSearchParams(window.location.search); let url = new URLSearchParams(window.location.search);
if (url === null) { if (url !== undefined) {
//@ts-ignore let new_universe;
let new_universe = JSON.parse(url.get("universe")); if (url !== null) {
console.log((this.universes["imported"] = new_universe)); const universeParam = url.get("universe");
this.loadUniverse("imported"); if (universeParam !== null) {
new_universe = JSON.parse(universeParam);
}
}
this.settings.universes["imported"] = new_universe;
this.loadUniverse("imported", false, new_universe);
} }
} }
@ -813,14 +818,22 @@ export class Editor {
/** /**
* @param universeName: The name of the universe to load * @param universeName: The name of the universe to load
*/ */
loadUniverse(universeName: string): void { loadUniverse(
// Saving the current file before initiating the switch logic universeName: string,
this.currentFile().candidate = this.view.state.doc.toString(); saving: boolean = true,
universe: Universe = template_universe
): void {
console.log(universeName, saving, universe);
if (saving) {
// Saving the current file before initiating the switch logic
this.currentFile().candidate = this.view.state.doc.toString();
}
// Getting the new universe name and moving on // Getting the new universe name and moving on
let selectedUniverse = universeName.trim(); let selectedUniverse = universeName.trim();
if (this.universes[selectedUniverse] === undefined) { if (this.universes[selectedUniverse] === undefined) {
this.universes[selectedUniverse] = template_universe; this.universes[selectedUniverse] = universe;
} }
this.selected_universe = selectedUniverse; this.selected_universe = selectedUniverse;
this.settings.selected_universe = this.selected_universe; this.settings.selected_universe = this.selected_universe;