mirror of
https://github.com/ParkerTenBroeck/hdl_sim.git
synced 2026-06-06 21:24:06 -04:00
better workspace support
This commit is contained in:
parent
53eb596861
commit
c6136920cb
6 changed files with 78 additions and 70 deletions
|
|
@ -648,7 +648,7 @@ class CircuitUiApp {
|
|||
|
||||
this.editor = new EditorController({
|
||||
...this.dom,
|
||||
enabled: config.initialMode === "local",
|
||||
enabled: config.initialMode === "uploaded",
|
||||
externalFiles: config.externalFiles,
|
||||
});
|
||||
|
||||
|
|
@ -670,7 +670,7 @@ class CircuitUiApp {
|
|||
this.outputs.resetVisuals();
|
||||
},
|
||||
onOpen: () => {
|
||||
if (this.mode === "local") {
|
||||
if (this.mode === "uploaded") {
|
||||
this.connection.send(this.editor.getFilesPayload());
|
||||
}
|
||||
this.connection.send({ input: this.inputs.getInputPayload() });
|
||||
|
|
@ -705,7 +705,7 @@ class CircuitUiApp {
|
|||
this.setRunButtonEnabled(false);
|
||||
this.setRunning(false);
|
||||
this.updateStatusIndicator();
|
||||
if (this.mode === "remote") {
|
||||
if (this.mode === "workspace") {
|
||||
this.scheduleReconnect();
|
||||
}
|
||||
},
|
||||
|
|
@ -741,13 +741,14 @@ class CircuitUiApp {
|
|||
|
||||
wireModeControls() {
|
||||
this.dom.modeToggle.addEventListener("change", () => {
|
||||
const nextMode = this.dom.modeToggle.checked ? "remote" : "local";
|
||||
const nextMode = this.dom.modeToggle.checked ? "uploaded" : "workspace";
|
||||
this.applyMode(nextMode);
|
||||
});
|
||||
}
|
||||
|
||||
applyMode(nextMode, fromInit = false) {
|
||||
const mode = nextMode === "remote" ? "remote" : "local";
|
||||
const mode =
|
||||
nextMode === "workspace" && this.config.workspaceEnabled ? "workspace" : "uploaded";
|
||||
const changed = this.mode !== mode;
|
||||
|
||||
if (!fromInit && changed && this.connection.isConnected()) {
|
||||
|
|
@ -759,13 +760,14 @@ class CircuitUiApp {
|
|||
localStorage.setItem(LS_KEY_MODE, mode);
|
||||
} catch {}
|
||||
|
||||
const isRemote = mode === "remote";
|
||||
this.dom.modeToggle.checked = isRemote;
|
||||
this.editor.setEnabled(!isRemote);
|
||||
this.dom.connectToggleBtn.classList.toggle("is-hidden", isRemote);
|
||||
this.dom.runToggleBtn.classList.toggle("is-hidden", !isRemote);
|
||||
const isUploaded = mode === "uploaded";
|
||||
this.dom.modeToggle.checked = isUploaded;
|
||||
this.dom.modeToggle.disabled = !this.config.workspaceEnabled;
|
||||
this.editor.setEnabled(isUploaded);
|
||||
this.dom.connectToggleBtn.classList.toggle("is-hidden", !isUploaded);
|
||||
this.dom.runToggleBtn.classList.toggle("is-hidden", isUploaded);
|
||||
|
||||
if (isRemote) {
|
||||
if (!isUploaded) {
|
||||
this.scheduleReconnect(0);
|
||||
} else {
|
||||
this.cancelReconnect();
|
||||
|
|
@ -831,27 +833,29 @@ function resolveConfig() {
|
|||
const config = window.VHDL_UI_CONFIG ?? {};
|
||||
const query = new URLSearchParams(location.search);
|
||||
const queryMode = (query.get("mode") ?? "").toLowerCase();
|
||||
const workspaceEnabled = config.workspaceEnabled !== false;
|
||||
|
||||
let storedMode = "";
|
||||
try {
|
||||
storedMode = (localStorage.getItem(LS_KEY_MODE) ?? "").toLowerCase();
|
||||
} catch {}
|
||||
|
||||
let initialMode = "local";
|
||||
if (queryMode === "local" || queryMode === "remote") {
|
||||
let initialMode = workspaceEnabled ? "workspace" : "uploaded";
|
||||
if (queryMode === "workspace" || queryMode === "uploaded") {
|
||||
initialMode = queryMode;
|
||||
} else if (storedMode === "local" || storedMode === "remote") {
|
||||
} else if (storedMode === "workspace" || storedMode === "uploaded") {
|
||||
initialMode = storedMode;
|
||||
} else if (config.mode === "local" || config.mode === "remote") {
|
||||
} else if (config.mode === "workspace" || config.mode === "uploaded") {
|
||||
initialMode = config.mode;
|
||||
} else if (query.has("externalEditor")) {
|
||||
initialMode = parseBoolean(query.get("externalEditor")) ? "remote" : "local";
|
||||
initialMode = parseBoolean(query.get("externalEditor")) ? "uploaded" : "workspace";
|
||||
} else if (parseBoolean(config.externalEditor)) {
|
||||
initialMode = "remote";
|
||||
initialMode = "uploaded";
|
||||
}
|
||||
|
||||
return {
|
||||
initialMode,
|
||||
initialMode: initialMode === "workspace" && !workspaceEnabled ? "uploaded" : initialMode,
|
||||
workspaceEnabled,
|
||||
externalFiles: config.externalFiles ?? null,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
<div class="panelTopStatus">
|
||||
<span class="pill state-disabled" id="statusPill">DISABLED</span>
|
||||
<label class="modeToggle" for="modeToggle">
|
||||
<span class="modeLabel">Local</span>
|
||||
<input id="modeToggle" type="checkbox" aria-label="Toggle remote mode" />
|
||||
<span class="modeLabel">Workspace</span>
|
||||
<input id="modeToggle" type="checkbox" aria-label="Toggle uploaded mode" />
|
||||
<span class="modeSlider" aria-hidden="true"></span>
|
||||
<span class="modeLabel">Remote</span>
|
||||
<span class="modeLabel">Uploaded</span>
|
||||
</label>
|
||||
<button id="connectToggleBtn">Connect</button>
|
||||
<button id="runToggleBtn" class="secondary" disabled>Start</button>
|
||||
|
|
@ -796,13 +796,6 @@
|
|||
</section>
|
||||
</main>
|
||||
|
||||
<script>
|
||||
// Optional runtime config hook:
|
||||
// window.VHDL_UI_CONFIG = {
|
||||
// mode: "local" | "remote",
|
||||
// externalFiles: { "circuit.vhdl": "..." }
|
||||
// };
|
||||
</script>
|
||||
<script src="app.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue