Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: closes #11954, fix custom skins with spaces

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-08-25 21:02:05 -04:00
parent 9d6aeba376
commit 965780b731
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/admin/appearance/skins.js
View File

@@ -2,8 +2,8 @@
define('admin/appearance/skins', [
'translator', 'alerts', 'settings', 'hooks',
], function (translator, alerts, settings, hooks) {
'translator', 'alerts', 'settings', 'hooks', 'slugify',
], function (translator, alerts, settings, hooks, slugify) {
const Skins = {};
Skins.init = function () {
@@ -14,9 +14,9 @@ define('admin/appearance/skins', [
}).done((bsData) => {
hooks.on('action:settings.sorted-list.loaded', (data) => {
if (data.hash === 'custom-skins') {
// lower case all custom-skin ids after load
// slugify all custom-skin ids after load
$('.custom-skin-settings [data-type="list"] [data-theme]').each((i, el) => {
$(el).attr('data-theme', $(el).attr('data-theme').toLowerCase());
$(el).attr('data-theme', slugify($(el).attr('data-theme')));
});
highlightSelectedTheme(app.config.bootswatchSkin);
}

6
src/meta/css.js
View File

@@ -260,7 +260,11 @@ CSS.getSkinSwitcherOptions = async function (uid) {
CSS.getCustomSkins(),
]);
const defaultSkin = _.capitalize(meta.config.bootswatchSkin) || '[[user:no-skin]]';
const foundCustom = customSkins.find(skin => skin.value === meta.config.bootswatchSkin);
const defaultSkin = foundCustom ?
foundCustom.name :
_.capitalize(meta.config.bootswatchSkin) || '[[user:no-skin]]';
const defaultSkins = [
{ name: `[[user:default, ${defaultSkin}]]`, value: '', selected: userSettings.bootswatchSkin === '' },
{ name: '[[user:no-skin]]', value: 'noskin', selected: userSettings.bootswatchSkin === 'noskin' },