Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-14 16:27:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with falsey user options getting overridden by truthy defaults

Browse source
This commit is contained in:
Alistair McKinlay 2017-08-16 09:01:09 +01:00
parent aef1bb3acc
commit bc2a37913f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/js/options.js
View file

@ -25,14 +25,16 @@ const options = {
thumbnails: true, thumbnails: true,
userStyles: userStyles.text(), userStyles: userStyles.text(),
}; };
const userOptions = JSON.parse(storage.get("settings")) || {}; let userOptions = JSON.parse(storage.get("settings")) || {};
for (const key in options) { for (const key in options) {
if (userOptions[key]) { if (userOptions[key] !== undefined) {
options[key] = userOptions[key]; options[key] = userOptions[key];
} }
} }
userOptions = null;
module.exports = options; module.exports = options;
module.exports.shouldOpenMessagePreview = function(type) { module.exports.shouldOpenMessagePreview = function(type) {