Skip to content

Commit ddffa4d

Browse files
authored
Showing the loader when users first interact and fixing bugs related to CDN use
1 parent 7bead8c commit ddffa4d

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

js/script.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/* Constants and default values */
1212

13-
const debug_mode = true;
13+
const debug_mode = false;
1414
const thumbnail_column = "Thumbnail";
1515
const supported_formats = ["JPG", "JPEG", "PNG", "APNG", "GIF", "SVG", "WEBP", "AVIF", "ICO"];
1616
const supported_version_formats = ["JPG", "JPEG", "PNG", "WEBP"];
@@ -2144,15 +2144,15 @@ Options -Indexes
21442144

21452145
const showLoader = function() {
21462146
const loaderDiv = globalThis.document.getElementById("gw-loader");
2147-
if (loaderDiv.style.display === "flex"){
2147+
if (!loaderDiv || loaderDiv.style.display === "flex"){
21482148
return;
21492149
}
21502150
loaderDiv.style.display = "flex";
21512151
}
21522152

21532153
const hideLoader = function() {
21542154
const loaderDiv = globalThis.document.getElementById("gw-loader");
2155-
loaderDiv.style.display = "none";
2155+
if (loaderDiv) loaderDiv.style.display = "none";
21562156
}
21572157

21582158
const putFolderIntoZip = function(folder, zip) {
@@ -3888,9 +3888,7 @@ Options -Indexes
38883888
return new Promise((resolve, _) => {
38893889
globalThis.lb.useSqlite(async (db) => {
38903890
if (globalThis.localStorage.getItem("tables-created") !== "true") {
3891-
await globalThis.lb.createTables(db);
3892-
globalThis.localStorage.setItem("tables-created", "true");
3893-
3891+
await globalThis.lb.createTables(db);
38943892
await insertThemeFromObject(db, default_theme, "current");
38953893
await insertThemeFromObject(db, default_theme, "default");
38963894
await globalThis.lb.setThemeConfig(default_theme["config"]);
@@ -3904,6 +3902,9 @@ Options -Indexes
39043902
await globalThis.lb.setSetting("articles-in-author-profile", "true");
39053903
await globalThis.lb.setSetting("article-in-feedback", "false");
39063904
await globalThis.lb.setSetting("website-language", "en");
3905+
3906+
globalThis.localStorage.setItem("tables-created", "true");
3907+
hideLoader();
39073908
} else {
39083909
await globalThis.lb.updateSettings();
39093910
fetchData(db);
@@ -4173,7 +4174,7 @@ Options -Indexes
41734174
await import ("../dependencies/ace/mode-javascript.js");
41744175
await import ("../dependencies/ace/mode-xml.js");
41754176
await import ("../dependencies/ace/theme-github_light_default.js");
4176-
ace.config.set('basePath', '../dependencies/ace')
4177+
ace.config.set('basePath', '../dependencies/ace');
41774178
}
41784179
} else {
41794180
if (["index"].includes(page)) {
@@ -4188,11 +4189,13 @@ Options -Indexes
41884189
await importFromCDN("https://cdn.jsdelivr.net/npm/ace-builds@" + ace_builds_version + "/src-min/mode-javascript.js", "../dependencies/ace/mode-javascript.js");
41894190
await importFromCDN("https://cdn.jsdelivr.net/npm/ace-builds@" + ace_builds_version + "/src-min/mode-xml.js", "../dependencies/ace/mode-xml.js");
41904191
await importFromCDN("https://cdn.jsdelivr.net/npm/ace-builds@" + ace_builds_version + "/src-min/theme-github_light_default.js", "../dependencies/ace/theme-github_light_default.js");
4192+
ace.config.set('basePath', "https://cdn.jsdelivr.net/npm/ace-builds@" + ace_builds_version + "/src-min");
41914193
}
41924194
}
41934195
}
41944196

41954197
const start = async function(lb) {
4198+
if (globalThis.localStorage.getItem("tables-created") !== "true") showLoader();
41964199
preFormatThead();
41974200

41984201
if (debug_mode === true || extensionEnvironment()) {

libreblog/libreblog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const sqlite_version = "3.49.2-build1";
2020
const marked_version = "15.0.12";
2121
//MIME types supported by most browsers in the HTMLCanvasElement interface
2222
const supported_version_formats = ["JPG", "JPEG", "PNG", "WEBP"];
23-
const debug_mode = true; //If false, it will load modules from a CDN (to be implemented)
23+
const debug_mode = false; //If false, it will load modules from a CDN (to be implemented)
2424
let conversion_cache = {}; //Used to store previous conversions from Markdown to HTML
2525
let declared_values_cache = {}; //Values that are declared inside the field "contents"
2626
let references_cache = {}; //Used to store all the references of all the articles
@@ -2181,7 +2181,7 @@ const importModules = async function() {
21812181
} else {
21822182
const {default: sqlite3InitModule} = await importFromCDN("https://cdn.jsdelivr.net/npm/@sqlite.org/sqlite-wasm@" + sqlite_version + "/sqlite-wasm/jswasm/sqlite3.mjs", "../dependencies/sqlite3/sqlite3.mjs");
21832183
globalThis.sqlite3InitModule = sqlite3InitModule;
2184-
await importFromCDN("https://cdn.jsdelivr.net/npm/twig@" + twig_version + "/src/twig.min.js", "../dependencies/twig/twig.min.js")
2184+
await importFromCDN("https://cdn.jsdelivr.net/npm/twig@" + twig_version + "/twig.min.js", "../dependencies/twig/twig.min.js")
21852185
globalThis.Twig = Twig;
21862186
const {marked} = await importFromCDN("https://cdn.jsdelivr.net/npm/marked@" + marked_version + "/lib/marked.esm.js", "../dependencies/marked/marked.esm.js")
21872187
globalThis.marked = marked;

0 commit comments

Comments
 (0)