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

Merge pull request #2033 from thelounge/xpaw/fix-default-theme

Browse Source 
Fix default theme not being correct
This commit is contained in:
Jérémie Astori 2018-02-06 00:26:14 -05:00 committed by GitHub
commit bbaea66d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/js/options.js
View File

@ -22,12 +22,14 @@ const options = {
notifyAllMessages: false, notifyAllMessages: false,
showSeconds: false, showSeconds: false,
statusMessages: "condensed", statusMessages: "condensed",
theme: $("#theme").prop("href").replace(/^themes\/(.*).css$/, "$1"), // Extracts default theme name, set on the server configuration theme: $("#theme").prop("href").match(/themes\/(.*?)\.css$/), // TODO: Make this a data attribute in v3
media: true, media: true,
userStyles: userStyles.text(), userStyles: userStyles.text(),
}; };
let userOptions = JSON.parse(storage.get("settings")) || {}; let userOptions = JSON.parse(storage.get("settings")) || {};
options.theme = options.theme ? options.theme[1] : "example"; // TODO: Remove in v3
for (const key in options) { for (const key in options) {
if (userOptions[key] !== undefined) { if (userOptions[key] !== undefined) {
options[key] = userOptions[key]; options[key] = userOptions[key];