diff --git a/dev/public/js/MARL/init.js b/dev/public/js/MARL/init.js
index 49b9054..bb5a6a3 100644
--- a/dev/public/js/MARL/init.js
+++ b/dev/public/js/MARL/init.js
@@ -18,7 +18,7 @@ document.addEventListener("alpine:init", () => {
"Bonjour!",
"Oh hey!",
];
- Alpine.store("ui").logMsg(`MARL loaded. ${salutations[Math.floor(Math.random() * salutations.length)]} 😊`);
+ marlConsole(`MARL loaded. ${salutations[Math.floor(Math.random() * salutations.length)]} 😊`);
resetStores();
});
diff --git a/dev/public/js/MARL/stores.js b/dev/public/js/MARL/stores.js
index 4d597a7..93185ee 100644
--- a/dev/public/js/MARL/stores.js
+++ b/dev/public/js/MARL/stores.js
@@ -3,7 +3,7 @@ const userPrefsStore = {
save(pref, value) {
const msg = `Saving user preference (${pref}: ${value})`;
- Alpine.store("ui").logMsg(msg, "info");
+ marlConsole(msg, "info");
localStorage.setItem(this.prefix + pref, value);
},
load(pref) {
@@ -41,7 +41,7 @@ const userPrefsStore = {
if (value) {
const msg = `Unrecognized language in user preferences: ${value}`;
console.warn(msg);
- Alpine.store("ui").logMsg(msg, "warn");
+ marlConsole(msg, "warn");
}
value = "en";
this.save("lang", value);
diff --git a/dev/public/js/MARL/utils.js b/dev/public/js/MARL/utils.js
index 01517c5..91ffa4d 100644
--- a/dev/public/js/MARL/utils.js
+++ b/dev/public/js/MARL/utils.js
@@ -1,3 +1,7 @@
+function marlConsole(msg, cls = "info") {
+ Alpine.store("ui").logMsg(msg, cls);
+}
+
function resetStores() {
Alpine.store("files").resetState();
Alpine.store("lightbox").resetState();
@@ -25,11 +29,11 @@ function unZip(files) {
) {
const msg = `File already loaded: ${file.name}`;
console.warn(msg);
- Alpine.store("ui").logMsg(msg, "warn");
+ marlConsole(msg, "warn");
continue;
}
- Alpine.store("ui").logMsg(`Loading file: ${file.name}`, "info");
+ marlConsole(`Loading file: ${file.name}`, "info");
JSZip.loadAsync(file).then(
(content) => {
@@ -72,7 +76,7 @@ function unZip(files) {
(error) => {
const msg = `Error loading ${file.name}: ${error.message}`;
console.error(msg);
- Alpine.store("ui").logMsg(msg, "error");
+ marlConsole(msg, "error");
abortLoading();
}
);
@@ -91,13 +95,13 @@ function loadJsonFile(name, index, fileInfos) {
// we can still run the app without those files
const msg = `${fileInfos.name}: File ${name}.json not found in archive.`;
console.warn(msg);
- Alpine.store("ui").logMsg(msg, "warn");
+ marlConsole(msg, "warn");
Alpine.store("files").sources[index].loaded[name] = true;
} else {
// this should NOT happen and will prevent the app from running
const msg = `Critical error - ${fileInfos.name}: File ${name}.json not found in archive.`;
console.error(msg);
- Alpine.store("ui").logMsg(msg, "error");
+ marlConsole(msg, "error");
}
return;
}
@@ -625,7 +629,7 @@ function detectLangFromBrowser() {
const msg = `Setting language based on browser preference: '${lang}' (${
Alpine.store("ui").appLangs[lang]
})`;
- Alpine.store("ui").logMsg(msg, "info");
+ marlConsole(msg, "info");
return lang;
}
}
@@ -640,7 +644,7 @@ function setLang() {
document.getElementsByTagName("html")[0].setAttribute("lang", lang);
const msg = `App language set to '${lang}' (${Alpine.store("ui").appLangs[lang]})`;
- Alpine.store("ui").logMsg(msg);
+ marlConsole(msg);
}
function setTheme(theme) {