From c4829fd8c29a31e5b535b2f508f8e082d7f0ab18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 29 Jul 2020 14:14:45 -0400 Subject: [PATCH] feat: allow changing requirejs base url --- public/src/require-config.js | 2 +- src/controllers/api.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/require-config.js b/public/src/require-config.js index 2657d4aa33..4e919329e4 100644 --- a/public/src/require-config.js +++ b/public/src/require-config.js @@ -1,7 +1,7 @@ 'use strict'; require.config({ - baseUrl: config.relative_path + '/assets/src/modules', + baseUrl: config.requireBaseUrl, waitSeconds: 0, urlArgs: config['cache-buster'], paths: { diff --git a/src/controllers/api.js b/src/controllers/api.js index 1e52e8113f..6989841c2d 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -19,6 +19,7 @@ apiController.loadConfig = async function (req) { let config = { relative_path: nconf.get('relative_path'), upload_url: nconf.get('upload_url'), + requireBaseUrl: nconf.get('relative_path') + '/assets/src/modules', siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')), browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')), titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'),