monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2024-09-22 00:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed custom theme being forced

Browse source
This commit is contained in:
Miodec 2021-10-24 14:16:01 +01:00
parent 1dda06bf70
commit 0150793e88
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/js/settings.js
View file

@ -489,7 +489,7 @@ export function update() {
LanguagePicker.setActiveGroup();
setActiveFunboxButton();
ThemePicker.updateActiveTab();
ThemePicker.setCustomInputs();
ThemePicker.setCustomInputs(true);
updateDiscordSection();
ThemePicker.refreshButtons();

34
src/js/settings/theme-picker.js
View file

@ -14,10 +14,11 @@ export function updateActiveButton() {
);
}
function updateColors(colorPicker, color, onlyStyle) {
function updateColors(colorPicker, color, onlyStyle, noThemeUpdate = false) {
if (onlyStyle) {
let colorid = colorPicker.find("input[type=color]").attr("id");
document.documentElement.style.setProperty(colorid, color);
if (!noThemeUpdate)
document.documentElement.style.setProperty(colorid, color);
let pickerButton = colorPicker.find("label");
pickerButton.val(color);
pickerButton.attr("value", color);
@ -62,7 +63,9 @@ function updateColors(colorPicker, color, onlyStyle) {
let colorid = colorPicker.find("input[type=color]").attr("id");
document.documentElement.style.setProperty(colorid, color);
if (!noThemeUpdate)
document.documentElement.style.setProperty(colorid, color);
let pickerButton = colorPicker.find("label");
pickerButton.val(color);
@ -122,7 +125,7 @@ export function refreshButtons() {
});
}
export function setCustomInputs() {
export function setCustomInputs(noThemeUpdate) {
$(
".pageSettings .section.themes .tabContainer .customTheme .colorPicker"
).each((n, index) => {
@ -138,8 +141,7 @@ export function setCustomInputs() {
// $(index).find("input[type=color]").val(currentColor);
// $(index).find("input[type=color]").attr("value", currentColor);
// $(index).find("input[type=text]").val(currentColor);
updateColors($(index), currentColor);
updateColors($(index), currentColor, false, noThemeUpdate);
});
}
@ -172,21 +174,21 @@ export function updateActiveTab() {
"active"
);
UI.swapElements(
$('.pageSettings .section.themes .tabContainer [tabContent="custom"]'),
$('.pageSettings .section.themes .tabContainer [tabContent="preset"]'),
250
);
// UI.swapElements(
// $('.pageSettings .section.themes .tabContainer [tabContent="custom"]'),
// $('.pageSettings .section.themes .tabContainer [tabContent="preset"]'),
// 250
// );
} else {
$(".pageSettings .section.themes .tabs .button[tab='custom']").addClass(
"active"
);
UI.swapElements(
$('.pageSettings .section.themes .tabContainer [tabContent="preset"]'),
$('.pageSettings .section.themes .tabContainer [tabContent="custom"]'),
250
);
// UI.swapElements(
// $('.pageSettings .section.themes .tabContainer [tabContent="preset"]'),
// $('.pageSettings .section.themes .tabContainer [tabContent="custom"]'),
// 250
// );
}
}