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

fixed account graph color being wrong

Browse source
This commit is contained in:
Jack 2020-08-08 19:43:55 +01:00
parent 256029a109
commit 48d2dc9ac9
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/js/account.js
View file

@ -821,6 +821,8 @@ function loadMoreLines() {
function refreshAccountPage() {
function cont() {
refreshThemeColorObject();
let chartData = [];
visibleTableLines = 0;
@ -1023,10 +1025,6 @@ function refreshAccountPage() {
loadMoreLines();
////////
if (themeColors.main == "") {
refreshThemeColorObject();
}
resultHistoryChart.options.scales.xAxes[0].ticks.minor.fontColor =
themeColors.sub;
resultHistoryChart.options.scales.yAxes[0].ticks.minor.fontColor =

7
public/js/script.js
View file

@ -2050,7 +2050,7 @@ function restartTest(withSameWordset = false) {
el = $("#wordsWrapper");
}
if (resultVisible) {
if (config.randomTheme) {
if (config.randomTheme && !pageTransition) {
randomiseTheme();
showNotification(config.theme.replace(/_/g, " "), 1500);
}
@ -2199,7 +2199,6 @@ function changePage(page) {
if (pageTransition) {
return;
}
if (page !== "test" && page !== "") restartTest();
let activePage = $(".page.active");
$(".page").removeClass("active");
$("#wordsInput").focusout();
@ -2219,6 +2218,7 @@ function changePage(page) {
restartTest();
} else if (page == "about") {
pageTransition = true;
restartTest();
swapElements(activePage, $(".page.pageAbout"), 250, () => {
pageTransition = false;
history.pushState("about", null, "about");
@ -2228,6 +2228,7 @@ function changePage(page) {
hideSignOutButton();
} else if (page == "settings") {
pageTransition = true;
restartTest();
swapElements(activePage, $(".page.pageSettings"), 250, () => {
pageTransition = false;
history.pushState("settings", null, "settings");
@ -2241,6 +2242,7 @@ function changePage(page) {
changePage("login");
} else {
pageTransition = true;
restartTest();
swapElements(activePage, $(".page.pageAccount"), 250, () => {
pageTransition = false;
history.pushState("account", null, "account");
@ -2255,6 +2257,7 @@ function changePage(page) {
changePage("account");
} else {
pageTransition = true;
restartTest();
swapElements(activePage, $(".page.pageLogin"), 250, () => {
pageTransition = false;
history.pushState("login", null, "login");

3
public/js/userconfig.js
View file

@ -636,6 +636,9 @@ function randomiseTheme() {
});
let randomtheme = randomList[Math.floor(Math.random() * randomList.length)];
setTheme(randomtheme.name, true);
setTimeout(() => {
refreshThemeColorObject();
}, 125);
}
function setRandomTheme(bool, nosave) {