diff --git a/public/assets/model/config.js b/public/assets/model/config.js index a5819524..6bce78f3 100644 --- a/public/assets/model/config.js +++ b/public/assets/model/config.js @@ -23,7 +23,7 @@ export function get(key, defaultValue) { } export function getVersion() { - return get("version", "na"); + return get("version", ""); } export function query() { diff --git a/public/assets/pages/filespage/ctrl_upload.js b/public/assets/pages/filespage/ctrl_upload.js index 9792af35..610478a8 100644 --- a/public/assets/pages/filespage/ctrl_upload.js +++ b/public/assets/pages/filespage/ctrl_upload.js @@ -3,10 +3,11 @@ import { toHref } from "../../lib/skeleton/router.js"; import rxjs, { effect, onClick } from "../../lib/rx.js"; import { forwardURLParams } from "../../lib/path.js"; import { animate, slideYOut } from "../../lib/animate.js"; -import { loadCSS } from "../../helpers/loader.js"; import { qs, qsa } from "../../lib/dom.js"; import { AjaxError } from "../../lib/error.js"; import assert from "../../lib/assert.js"; +import { get as getConfig } from "../../model/config.js"; +import { loadCSS } from "../../helpers/loader.js"; import { currentPath, isNativeFileUpload } from "./helper.js"; import { getPermission, calculatePermission } from "./model_acl.js"; import { mkdir, save } from "./model_virtual_layer.js"; @@ -358,7 +359,7 @@ function workerImplFile({ progress, speed }) { } async prepareJob({ file, path, virtual }) { - const chunkSize = (window.CONFIG["upload_chunk_size"] || 0) *1024*1024; + const chunkSize = getConfig("upload_chunk_size", 0) *1024*1024; const numberOfChunks = Math.ceil(file.size / chunkSize); const headersNoCache = { "Cache-Control": "no-store", diff --git a/public/assets/pages/filespage/thing.js b/public/assets/pages/filespage/thing.js index 5e9ea179..d985b12e 100644 --- a/public/assets/pages/filespage/thing.js +++ b/public/assets/pages/filespage/thing.js @@ -1,6 +1,7 @@ import { createElement } from "../../lib/skeleton/index.js"; import { animate, opacityOut, opacityIn } from "../../lib/animate.js"; import assert from "../../lib/assert.js"; +import { get as getConfig } from "../../model/config.js"; import { extractPath, isDir, isNativeFileUpload } from "./helper.js"; import { files$ } from "./ctrl_filesystem.js"; @@ -24,11 +25,12 @@ const IMAGE = { let TYPES = null; export function init() { TYPES = { - MIME: window.CONFIG.mime, + MIME: getConfig("mime", {}), THUMBNAILER: (function() { const set = new Set(); - for (let i=0; i rxjs.of(window.CONFIG).pipe( + rxjs.mergeMap((content) => rxjs.of(getConfig()).pipe( rxjs.mergeMap((config) => rxjs.from(loadKeybinding(config.editor)).pipe(rxjs.mapTo(config))), rxjs.map((config) => [content, config]), rxjs.mergeMap((arr) => rxjs.from(loadMode(extname(getFilename()))).pipe( diff --git a/public/assets/pages/viewerpage/application_image.js b/public/assets/pages/viewerpage/application_image.js index e3e47b66..5936ad2e 100644 --- a/public/assets/pages/viewerpage/application_image.js +++ b/public/assets/pages/viewerpage/application_image.js @@ -3,13 +3,14 @@ import { toHref } from "../../lib/skeleton/router.js"; import rxjs, { effect, onLoad, onClick } from "../../lib/rx.js"; import { animate } from "../../lib/animate.js"; import { extname } from "../../lib/path.js"; -import { loadCSS } from "../../helpers/loader.js"; import { qs } from "../../lib/dom.js"; +import { get as getConfig } from "../../model/config.js"; +import { Chromecast } from "../../model/chromecast.js"; +import { loadCSS } from "../../helpers/loader.js"; import { createLoader } from "../../components/loader.js"; import notification from "../../components/notification.js"; import t from "../../locales/index.js"; import ctrlError from "../ctrl_error.js"; -import { Chromecast } from "../../model/chromecast.js"; import { transition } from "./common.js"; @@ -129,7 +130,7 @@ function buttonChromecast(filename, downloadURL) { const link = Chromecast.createLink("/" + toHref(downloadURL)); const media = new window.chrome.cast.media.MediaInfo( link, - window.CONFIG.mime[extname(filename)], + getConfig("mime", {})[extname(filename)], ); media.metadata = new window.chrome.cast.media.PhotoMediaMetadata(); media.metadata.title = filename;