Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-28 09:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: +assetBaseUrl, -l10BaseUrl, -requireBaseUrl

Browse Source 
Additional base URLs were necessary for benchpress and translator,
and in order to not clutter the API response with needless one-
time use base URLs, I decided to use a single base that is used
by all of the services, assetBaseUrl.
This commit is contained in:
Julian Lam
2020-08-10 10:22:47 -04:00
parent 75ef4bbe34
commit 9adaccd036
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/ajaxify.js
View File

@@ -328,7 +328,7 @@ $(document).ready(function () {
}; };
ajaxify.loadTemplate = function (template, callback) { ajaxify.loadTemplate = function (template, callback) {
require([config.relative_path + '/assets/templates/' + template + '.js'], callback, function (err) { require([config.assetBaseUrl + '/templates/' + template + '.js'], callback, function (err) {
console.error('Unable to load template: ' + template); console.error('Unable to load template: ' + template);
throw err; throw err;
}); });

6
public/src/modules/translator.js
View File

@@ -2,7 +2,7 @@
(function (factory) { (function (factory) {
function loadClient(language, namespace) { function loadClient(language, namespace) {
return Promise.resolve(jQuery.getJSON(config.l10nBaseUrl + '/' + language + '/' + namespace + '.json?' + config['cache-buster'])); return Promise.resolve(jQuery.getJSON([config.assetBaseUrl, 'language', language, namespace].join('/') + '.json?' + config['cache-buster']));
} }
var warn = function () { console.warn.apply(console, arguments); }; var warn = function () { console.warn.apply(console, arguments); };
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
@@ -605,7 +605,7 @@
} }
var originalSettings = assign({}, jQuery.timeago.settings.strings); var originalSettings = assign({}, jQuery.timeago.settings.strings);
jQuery.getScript(config.relative_path + '/assets/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '-short.js').done(function () { jQuery.getScript(config.assetBaseUrl + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '-short.js').done(function () {
adaptor.timeagoShort = assign({}, jQuery.timeago.settings.strings); adaptor.timeagoShort = assign({}, jQuery.timeago.settings.strings);
jQuery.timeago.settings.strings = assign({}, originalSettings); jQuery.timeago.settings.strings = assign({}, originalSettings);
toggle(); toggle();
@@ -620,7 +620,7 @@
delete adaptor.timeagoShort; delete adaptor.timeagoShort;
var languageCode = utils.userLangToTimeagoCode(config.userLang); var languageCode = utils.userLangToTimeagoCode(config.userLang);
jQuery.getScript(config.relative_path + '/assets/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '.js').done(callback); jQuery.getScript(config.assetBaseUrl + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '.js').done(callback);
}, },
prepareDOM: function prepareDOM() { prepareDOM: function prepareDOM() {

2
public/src/require-config.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
require.config({ require.config({
baseUrl: config.requireBaseUrl, baseUrl: config.assetBaseUrl + '/src/modules',
waitSeconds: 0, waitSeconds: 0,
urlArgs: config['cache-buster'], urlArgs: config['cache-buster'],
paths: { paths: {

3
src/controllers/api.js
View File

@@ -19,8 +19,7 @@ apiController.loadConfig = async function (req) {
let config = { let config = {
relative_path: nconf.get('relative_path'), relative_path: nconf.get('relative_path'),
upload_url: nconf.get('upload_url'), upload_url: nconf.get('upload_url'),
requireBaseUrl: `${nconf.get('relative_path')}/assets/src/modules`, assetBaseUrl: `${nconf.get('relative_path')}/assets`,
l10nBaseUrl: `${nconf.get('relative_path')}/assets/language`,
siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')), siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')),
browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')), browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')),
titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'), titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'),