Skip to content

Commit 3c4fe7d

Browse files
authored
library: Remove the need for noop code files (#689)
1 parent 61683bf commit 3c4fe7d

File tree

22 files changed

+90
-116
lines changed

22 files changed

+90
-116
lines changed

β€Žsrc/Document.jsβ€Ž

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,13 @@ async function loadSourceBuffer({ source_file, buffer, lang }) {
6868
buffer,
6969
file: source_file,
7070
});
71-
let success;
7271
try {
73-
success = await file_loader.load_async(GLib.PRIORITY_DEFAULT, null, null);
72+
await file_loader.load_async(GLib.PRIORITY_DEFAULT, null, null);
7473
} catch (err) {
75-
if (err.code === Gio.IOErrorEnum.NOT_FOUND) {
76-
if (lang.placeholder) {
77-
buffer.set_text(lang.placeholder, -1);
78-
}
79-
success = true;
80-
} else {
74+
if (err.code !== Gio.IOErrorEnum.NOT_FOUND) {
8175
throw err;
8276
}
8377
}
8478

85-
if (success) {
86-
buffer.set_modified(false);
87-
}
79+
buffer.set_modified(false);
8880
}

β€Žsrc/Library/EntryRow.jsβ€Ž

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ class EntryRow extends Adw.PreferencesRow {
3131
}
3232

3333
#createLanguageTags(demo) {
34-
const language = getLanguage("javascript");
35-
const language_tag = this.#createLanguageTag(language);
36-
this._languages_box.append(language_tag);
37-
38-
["vala", "rust"].forEach((id) => {
34+
["javascript", "vala", "rust"].forEach((id) => {
3935
const language = getLanguage(id);
4036
if (!demo.languages.includes(language.id)) return;
4137
const language_tag = this.#createLanguageTag(language);

β€Žsrc/Library/Library.jsβ€Ž

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
demos_dir,
77
getLanguage,
88
settings as global_settings,
9+
languages,
910
} from "../util.js";
1011
import Window from "../window.js";
1112

@@ -71,7 +72,6 @@ export function getDemo(name) {
7172
return demos.find((demo) => demo.name === name);
7273
}
7374

74-
const lang_javascript = getLanguage("javascript");
7575
async function openDemo({ application, demo_name, language }) {
7676
const demo = getDemo(demo_name);
7777
const session = createSessionFromDemo(demo);
@@ -86,9 +86,18 @@ async function openDemo({ application, demo_name, language }) {
8686
session.settings.set_boolean("show-code", true);
8787
}
8888

89-
const is_js =
90-
session.settings.get_int("code-language") === lang_javascript.index;
89+
const code_languge = session.settings.get_int("code-language");
90+
const lang = languages.find((lang) => lang.index === code_languge);
9191

92+
// Override the user preferred language if the demo doesn't support it
93+
if (demo.languages.length > 0 && !demo.languages.includes(lang.id)) {
94+
session.settings.set_int(
95+
"code-language",
96+
getLanguage(demo.languages[0]).index,
97+
);
98+
}
99+
100+
const run = demo.autorun && lang.id === "javascript";
92101
const { load } = Window({ application, session });
93-
await load({ run: demo.autorun && is_js });
102+
await load({ run });
94103
}

β€Žsrc/Library/demos/Advanced Buttons/code.rsβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Žsrc/Library/demos/Advanced Buttons/main.valaβ€Ž

Lines changed: 0 additions & 3 deletions
This file was deleted.

β€Žsrc/Library/demos/Boxed Lists/code.rsβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Žsrc/Library/demos/Boxed Lists/main.valaβ€Ž

Lines changed: 0 additions & 3 deletions
This file was deleted.

β€Žsrc/Library/demos/Center Box/code.rsβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Žsrc/Library/demos/Center Box/main.valaβ€Ž

Lines changed: 0 additions & 3 deletions
This file was deleted.

β€Žsrc/Library/demos/Editable Label/code.rsβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
Β (0)