supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2213 from thelounge/xpaw/theme-repaint

Browse Source 
Do not repaint theme on page load
This commit is contained in:
Pavel Djundik 2018-03-13 18:26:52 +02:00 committed by GitHub
commit 120953773e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/js/options.js
View File

@ -63,8 +63,8 @@ if (typeof userSettings.userStyles === "string" && !noCSSparamReg.test(window.lo
$userStyles.html(userSettings.userStyles); $userStyles.html(userSettings.userStyles);
} }
if (typeof userSettings.theme === "string") { if (typeof userSettings.theme === "string" && $theme.attr("href") !== `themes/${userSettings.theme}.css`) {
$theme.prop("href", `themes/${userSettings.theme}.css`); $theme.attr("href", `themes/${userSettings.theme}.css`);
} }
userSettings = null; userSettings = null;
@ -110,7 +110,11 @@ function applySetting(name, value) {
} else if (name === "coloredNicks") { } else if (name === "coloredNicks") {
$chat.toggleClass("colored-nicks", value); $chat.toggleClass("colored-nicks", value);
} else if (name === "theme") { } else if (name === "theme") {
$theme.prop("href", `themes/${value}.css`); value = `themes/${value}.css`;
if ($theme.attr("href") !== value) {
$theme.attr("href", value);
}
} else if (name === "userStyles" && !noCSSparamReg.test(window.location.search)) { } else if (name === "userStyles" && !noCSSparamReg.test(window.location.search)) {
$userStyles.html(value); $userStyles.html(value);
} else if (name === "highlights") { } else if (name === "highlights") {