monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-02-02 12:00:10 +08:00
Code Issues Projects Releases Packages Wiki Activity

checking for default before applying config

Browse source
This commit is contained in:
Jack 2020-11-06 19:21:29 +00:00
parent 04f6ef7849
commit a65b177334
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/js/userconfig.js
View file

@ -149,17 +149,25 @@ function saveActiveTagsToCookie() {
}
function loadConfigFromCookie() {
console.log("loading cookie config");
let newConfig = $.cookie("config");
if (newConfig !== undefined) {
newConfig = JSON.parse(newConfig);
applyConfig(newConfig);
console.log("applying cookie config");
cookieConfig = newConfig;
saveConfigToCookie(true);
console.log("saving cookie config");
}
restartTest(false, true);
}
function applyConfig(configObj) {
Object.keys(defaultConfig).forEach((configKey) => {
if (configObj[configKey] === undefined) {
configObj[configKey] = defaultConfig[configKey];
}
});
if (configObj && configObj != null && configObj != "null") {
setTheme(configObj.theme, true);
setCustomTheme(configObj.customTheme, true);
@ -283,11 +291,6 @@ function applyConfig(configObj) {
$("#ad3").remove();
}
}
Object.keys(defaultConfig).forEach((configKey) => {
if (config[configKey] == undefined) {
config[configKey] = defaultConfig[configKey];
}
});
updateTestModesNotice();
}
@ -1284,12 +1287,12 @@ function changeKeymapMode(mode, nosave) {
if (mode == null || mode == undefined) {
mode = "off";
}
if (mode === "react") {
$(".active-key").removeClass("active-key");
}
if (mode === "next") {
$(".keymap-key").attr("style", "");
}
// if (mode === "react" ||) {
$(".active-key").removeClass("active-key");
// }
// if (mode === "next") {
$(".keymap-key").attr("style", "");
// }
config.keymapMode = mode;
if (!nosave) restartTest(false, nosave);
if (!nosave) saveConfigToCookie();