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

fixed theme buttons duplicating

Browse source 
closes #2477
This commit is contained in:
Miodec 2022-02-12 13:36:17 +01:00
parent 6e9e400748
commit cb9a07e0c2
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/js/pages/settings.js
View file

@ -479,8 +479,8 @@ export async function fillSettingsPage() {
setEventDisabled(true);
await initGroups();
setEventDisabled(false);
await ThemePicker.refreshButtons();
await UpdateConfig.loadPromise;
ThemePicker.refreshButtons();
}
// export let settingsFillPromise = fillSettingsPage();
@ -652,7 +652,6 @@ export function update() {
ThemePicker.setCustomInputs(true);
updateDiscordSection();
updateAuthSections();
ThemePicker.refreshButtons();
// ThemePicker.updateActiveButton();
$(".pageSettings .section.paceCaret input.customPaceCaretSpeed").val(

55
frontend/src/js/settings/theme-picker.js
View file

@ -78,7 +78,7 @@ function updateColors(colorPicker, color, onlyStyle, noThemeUpdate = false) {
colorPicker.find("input[type=color]").attr("value", color);
}
export function refreshButtons() {
export async function refreshButtons() {
let favThemesEl = $(
".pageSettings .section.themes .favThemes.buttons"
).empty();
@ -89,42 +89,41 @@ export function refreshButtons() {
activeThemeName = ThemeController.randomTheme;
}
Misc.getSortedThemesList().then((themes) => {
//first show favourites
if (Config.favThemes.length > 0) {
favThemesEl.css({ paddingBottom: "1rem" });
themes.forEach((theme) => {
if (Config.favThemes.includes(theme.name)) {
let activeTheme = activeThemeName === theme.name ? "active" : "";
favThemesEl.append(
`<div class="theme button ${activeTheme}" theme='${
theme.name
}' style="color:${theme.mainColor};background:${theme.bgColor}">
<div class="activeIndicator"><i class="fas fa-circle"></i></div>
<div class="text">${theme.name.replace(/_/g, " ")}</div>
<div class="favButton active"><i class="fas fa-star"></i></div></div>`
);
}
});
} else {
favThemesEl.css({ paddingBottom: "0" });
}
//then the rest
const themes = await Misc.getSortedThemesList();
//first show favourites
if (Config.favThemes.length > 0) {
favThemesEl.css({ paddingBottom: "1rem" });
themes.forEach((theme) => {
if (!Config.favThemes.includes(theme.name)) {
if (Config.favThemes.includes(theme.name)) {
let activeTheme = activeThemeName === theme.name ? "active" : "";
themesEl.append(
favThemesEl.append(
`<div class="theme button ${activeTheme}" theme='${
theme.name
}' style="color:${theme.mainColor};background:${theme.bgColor}">
<div class="activeIndicator"><i class="fas fa-circle"></i></div>
<div class="text">${theme.name.replace(/_/g, " ")}</div>
<div class="favButton"><i class="far fa-star"></i></div></div>`
<div class="activeIndicator"><i class="fas fa-circle"></i></div>
<div class="text">${theme.name.replace(/_/g, " ")}</div>
<div class="favButton active"><i class="fas fa-star"></i></div></div>`
);
}
});
updateActiveButton();
} else {
favThemesEl.css({ paddingBottom: "0" });
}
//then the rest
themes.forEach((theme) => {
if (!Config.favThemes.includes(theme.name)) {
let activeTheme = activeThemeName === theme.name ? "active" : "";
themesEl.append(
`<div class="theme button ${activeTheme}" theme='${
theme.name
}' style="color:${theme.mainColor};background:${theme.bgColor}">
<div class="activeIndicator"><i class="fas fa-circle"></i></div>
<div class="text">${theme.name.replace(/_/g, " ")}</div>
<div class="favButton"><i class="far fa-star"></i></div></div>`
);
}
});
updateActiveButton();
}
export function setCustomInputs(noThemeUpdate) {