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

Added null check for keymap style

Browse source
This commit is contained in:
David Martin 2020-10-26 03:46:47 -05:00
parent 50bed0599c
commit c6f9dd9f93
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
public/js/userconfig.js
View file

@ -65,7 +65,7 @@ let defaultConfig = {
chartAccuracy: true,
chartStyle: "line",
minWpm: "off",
minWpmCustomSpeed: 100
minWpmCustomSpeed: 100,
};
let cookieConfig = null;
@ -281,7 +281,7 @@ function setDifficulty(diff, nosave) {
diff = "normal";
}
config.difficulty = diff;
if (!nosave) restartTest(false,nosave);
if (!nosave) restartTest(false, nosave);
updateTestModesNotice();
if (!nosave) saveConfigToCookie();
}
@ -325,11 +325,9 @@ function updateChartStyle() {
if (config.chartStyle == "scatter") {
resultHistoryChart.data.datasets[0].showLine = false;
resultHistoryChart.data.datasets[1].showLine = false;
} else {
resultHistoryChart.data.datasets[0].showLine = true;
resultHistoryChart.data.datasets[1].showLine = true;
}
resultHistoryChart.update();
}
@ -602,9 +600,8 @@ function setPageWidth(val, nosave) {
$("#centerContent").removeClass("wide200");
$("#centerContent").removeClass("widemax");
if (val !== "100") {
$("#centerContent").addClass('wide' + val);
$("#centerContent").addClass("wide" + val);
}
if (!nosave) saveConfigToCookie();
}
@ -622,7 +619,7 @@ function setCaretStyle(caretStyle, nosave) {
if (caretStyle == "off") {
$("#caret").addClass("off");
}else if (caretStyle == "default") {
} else if (caretStyle == "default") {
$("#caret").addClass("default");
} else if (caretStyle == "block") {
$("#caret").addClass("block");
@ -647,7 +644,7 @@ function setPaceCaretStyle(caretStyle, nosave) {
if (caretStyle == "off") {
$("#paceCaret").addClass("off");
}else if (caretStyle == "default") {
} else if (caretStyle == "default") {
$("#paceCaret").addClass("default");
} else if (caretStyle == "block") {
$("#paceCaret").addClass("block");
@ -765,9 +762,9 @@ function changeQuoteLength(len, nosave) {
if (!nosave) changeMode("quote", nosave);
config.quoteLength = len;
$("#top .config .quoteLength .text-button").removeClass("active");
$("#top .config .quoteLength .text-button[quoteLength='" + len + "']").addClass(
"active"
);
$(
"#top .config .quoteLength .text-button[quoteLength='" + len + "']"
).addClass("active");
if (!nosave) saveConfigToCookie();
}
@ -953,7 +950,6 @@ function setConfidenceMode(cm, nosave) {
if (!nosave) saveConfigToCookie();
}
function toggleIndicateTypos() {
it = !config.indicateTypos;
if (it == undefined) {
@ -971,7 +967,6 @@ function setIndicateTypos(it, nosave) {
if (!nosave) saveConfigToCookie();
}
function previewTheme(name, setIsPreviewingVar = true) {
if (
(testActive || resultVisible) &&
@ -999,7 +994,7 @@ function setTheme(name, nosave) {
config.theme = name;
$(".keymap-key").attr("style", "");
$("#currentTheme").attr("href", `themes/${name}.css`);
$(".current-theme").text(name.replace('_',' '));
$(".current-theme").text(name.replace("_", " "));
setTimeout(() => {
updateFavicon(32, 14);
}, 500);
@ -1071,7 +1066,7 @@ function applyCustomThemeColors() {
document.documentElement.style.setProperty(e, array[index]);
});
} else {
$(".current-theme").text(config.theme.replace('_',' '));
$(".current-theme").text(config.theme.replace("_", " "));
previewTheme(config.theme);
colorVars.forEach((e) => {
document.documentElement.style.setProperty(e, "");
@ -1196,7 +1191,7 @@ function changeKeymapMode(mode, nosave) {
$(".keymap-key").attr("style", "");
}
config.keymapMode = mode;
if (!nosave) restartTest(false,nosave);
if (!nosave) restartTest(false, nosave);
if (!nosave) saveConfigToCookie();
}
@ -1205,6 +1200,10 @@ function changeKeymapStyle(style, nosave) {
$(".keymap").removeClass("split");
$(".keymap").removeClass("split_matrix");
if (style == null || style == undefined) {
style = "staggered";
}
if (style === "matrix") {
$(".keymap").addClass("matrix");
} else if (style === "split") {