client,server: Enforce min value of max content width (closes #593)

TriliumNext · Nov 15, 2024 · 2260dce · 2260dce
1 parent 40c9ef6
commit 2260dce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/public/app/widgets/type_widgets/options/appearance/max_content_width.js b/src/public/app/widgets/type_widgets/options/appearance/max_content_width.js
@@ -2,6 +2,8 @@ import OptionsWidget from "../options_widget.js";
 import utils from "../../../../services/utils.js";
 import { t } from "../../../../services/i18n.js";
 
+const MIN_VALUE = 640;
+
 const TPL = `
 <div class="options-section">
     <h4>${t("max_content_width.title")}</h4>
@@ -11,7 +13,7 @@ const TPL = `
     <div class="form-group row">
         <div class="col-6">
             <label>${t("max_content_width.max_width_label")}</label>
-            <input type="number" min="200" step="10" class="max-content-width form-control options-number-input">
+            <input type="number" min="${MIN_VALUE}" step="10" class="max-content-width form-control options-number-input">
         </div>
     </div>
     
@@ -34,6 +36,6 @@ export default class MaxContentWidthOptions extends OptionsWidget {
     }
 
     async optionsLoaded(options) {
-        this.$maxContentWidth.val(options.maxContentWidth);
+        this.$maxContentWidth.val(Math.max(MIN_VALUE, options.maxContentWidth));
     }
 }
diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -42,7 +42,7 @@ function index(req: Request, res: Response) {
         isDev: env.isDev(),
         isMainWindow: !req.query.extraWindow,
         isProtectedSessionAvailable: protectedSessionService.isProtectedSessionAvailable(),
-        maxContentWidth: parseInt(options.maxContentWidth),
+        maxContentWidth: Math.max(640, parseInt(options.maxContentWidth)),
         triliumVersion: packageJson.version,
         assetPath: assetPath,
         appPath: appPath