Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: skin not changing after login or logout, #7038

Browse Source
This commit is contained in:
Julian Lam
2018-12-04 12:06:13 -05:00
parent 89acb89659
commit 28a1fa780a
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/src/app.js
View File

@@ -139,6 +139,7 @@ app.cacheBuster = null;
Notifications.prepareDOM(); Notifications.prepareDOM();
Chat.prepareDOM(); Chat.prepareDOM();
app.reskin(data.config.bootswatchSkin);
callback(); callback();
}); });
}); });
@@ -734,4 +735,21 @@ app.cacheBuster = null;
}); });
}); });
}; };
app.reskin = function (skinName) {
var clientEl = Array.prototype.filter.call(document.querySelectorAll('link[rel="stylesheet"]'), function (el) {
return el.href.indexOf(config.relative_path + '/assets/client') !== -1;
})[0] || null;
// Update client.css link element to point to selected skin variant
clientEl.href = config.relative_path + '/assets/client' + (skinName ? '-' + skinName : '') + '.css';
var currentSkinClassName = $('body').attr('class').split(/\s+/).filter(function (className) {
return className.startsWith('skin-');
});
$('body').removeClass(currentSkinClassName.join(' '));
if (skinName) {
$('body').addClass('skin-' + skinName);
}
};
}()); }());

22
public/src/client/account/settings.js
View File

@@ -4,9 +4,10 @@
define('forum/account/settings', ['forum/account/header', 'components', 'sounds'], function (header, components, sounds) { define('forum/account/settings', ['forum/account/header', 'components', 'sounds'], function (header, components, sounds) {
var AccountSettings = {}; var AccountSettings = {};
// If page skin is changed but not saved, switch the skin back
$(window).on('action:ajaxify.start', function () { $(window).on('action:ajaxify.start', function () {
if (ajaxify.data.template.name === 'account/settings' && $('#bootswatchSkin').val() !== config.bootswatchSkin) { if (ajaxify.data.template.name === 'account/settings' && $('#bootswatchSkin').val() !== config.bootswatchSkin) {
changePageSkin(config.bootswatchSkin); app.reskin(config.bootswatchSkin);
} }
}); });
@@ -30,7 +31,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
}); });
$('#bootswatchSkin').on('change', function () { $('#bootswatchSkin').on('change', function () {
changePageSkin($(this).val()); app.reskin($(this).val());
}); });
$('[data-property="homePageRoute"]').on('change', toggleCustomRoute); $('[data-property="homePageRoute"]').on('change', toggleCustomRoute);
@@ -48,23 +49,6 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
components.get('user/sessions').find('.timeago').timeago(); components.get('user/sessions').find('.timeago').timeago();
}; };
function changePageSkin(skinName) {
var clientEl = Array.prototype.filter.call(document.querySelectorAll('link[rel="stylesheet"]'), function (el) {
return el.href.indexOf(config.relative_path + '/assets/client') !== -1;
})[0] || null;
// Update client.css link element to point to selected skin variant
clientEl.href = config.relative_path + '/assets/client' + (skinName ? '-' + skinName : '') + '.css';
var currentSkinClassName = $('body').attr('class').split(/\s+/).filter(function (className) {
return className.startsWith('skin-');
});
$('body').removeClass(currentSkinClassName.join(' '));
if (skinName) {
$('body').addClass('skin-' + skinName);
}
}
function loadSettings() { function loadSettings() {
var settings = {}; var settings = {};