From df0730cac5984343faaa99e689b7be00f5d746cc Mon Sep 17 00:00:00 2001 From: Corey Bergeron Date: Thu, 15 Oct 2020 23:17:07 -0400 Subject: [PATCH 1/2] Saved chart accuracy toggle to user config --- public/js/account.js | 15 --------------- public/js/userconfig.js | 29 ++++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/public/js/account.js b/public/js/account.js index 7f7233f20..84f2e012b 100644 --- a/public/js/account.js +++ b/public/js/account.js @@ -2494,21 +2494,6 @@ function hideResultEditTagsPanel() { } } -let chartAccuracyVisible = true; - -function toggleChartAccuracy() { - if (chartAccuracyVisible) { - resultHistoryChart.data.datasets[1].hidden = true; - resultHistoryChart.options.scales.yAxes[1].display = false; - chartAccuracyVisible = false; - } else { - resultHistoryChart.data.datasets[1].hidden = false; - resultHistoryChart.options.scales.yAxes[1].display = true; - chartAccuracyVisible = true; - } - resultHistoryChart.update(); -} - $(".pageAccount .toggleAccuracyOnChart").click((params) => { toggleChartAccuracy(); }); diff --git a/public/js/userconfig.js b/public/js/userconfig.js index 28190f97c..644f9e74c 100644 --- a/public/js/userconfig.js +++ b/public/js/userconfig.js @@ -61,7 +61,8 @@ let defaultConfig = { showOutOfFocusWarning: true, paceCaret: "off", paceCaretCustomSpeed: 100, - pageWidth: "100" + pageWidth: "100", + chartAccuracy: true }; let cookieConfig = null; @@ -203,6 +204,7 @@ function applyConfig(configObj) { setPaceCaret(configObj.paceCaret, true); setPaceCaretCustomSpeed(configObj.paceCaretCustomSpeed, true); setPageWidth(configObj.pageWidth, true); + setChartAccuracy(configObj.chartAccuracy, true); config.startGraphsAtZero = configObj.startGraphsAtZero; // if ( @@ -308,6 +310,31 @@ function setBlindMode(blind, nosave) { if (!nosave) saveConfigToCookie(); } +function updateChartAccuracy() { + resultHistoryChart.data.datasets[1].hidden = !config.chartAccuracy; + resultHistoryChart.options.scales.yAxes[1].display = config.chartAccuracy; + resultHistoryChart.update(); +} + +function toggleChartAccuracy() { + if (config.chartAccuracy) { + config.chartAccuracy = false; + } else { + config.chartAccuracy = true; + } + updateChartAccuracy(); + saveConfigToCookie(); +} + +function setChartAccuracy(chartAccuracy, nosave) { + if (chartAccuracy == undefined) { + chartAccuracy = true; + } + config.chartAccuracy = chartAccuracy; + updateChartAccuracy(); + if (!nosave) saveConfigToCookie(); +} + //read ahead mode // function toggleReadAheadMode() { // config.readAheadMode = !config.readAheadMode; From 4d2fc03a9260ecf5611d8a4aab00410db5a97909 Mon Sep 17 00:00:00 2001 From: Corey Bergeron Date: Thu, 15 Oct 2020 23:37:34 -0400 Subject: [PATCH 2/2] disable sign up button once clicked --- public/css/style.scss | 11 +++++++++++ public/js/account.js | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/public/css/style.scss b/public/css/style.scss index eb959919f..b84f00db2 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -2627,6 +2627,17 @@ key { background: var(--main-color); outline: none; } + + &.disabled { + &:hover { + color: var(--sub-color); + background: var(--bg-color); + cursor: default; + } + color: var(--sub-color); + background: var(--bg-color); + cursor: default; + } } .text-button { diff --git a/public/js/account.js b/public/js/account.js index 63fd06a35..e6a65e88f 100644 --- a/public/js/account.js +++ b/public/js/account.js @@ -1,10 +1,12 @@ $(".pageLogin .register input").keyup((e) => { + if ($(".pageLogin .register .button").hasClass("disabled")) return; if (e.key == "Enter") { signUp(); } }); $(".pageLogin .register .button").click((e) => { + if ($(".pageLogin .register .button").hasClass("disabled")) return; signUp(); }); @@ -96,6 +98,7 @@ function signIn() { let dontCheckUserName = false; function signUp() { + $(".pageLogin .register .button").addClass("disabled"); $(".pageLogin .preloader").removeClass("hidden"); let nname = $(".pageLogin .register input")[0].value; let email = $(".pageLogin .register input")[1].value; @@ -108,6 +111,7 @@ function signUp() { if (d.data === -1) { showNotification("Name unavailable", 3000); $(".pageLogin .preloader").addClass("hidden"); + $(".pageLogin .register .button").removeClass("disabled"); return; } else if (d.data === -2) { showNotification( @@ -115,11 +119,13 @@ function signUp() { 8000 ); $(".pageLogin .preloader").addClass("hidden"); + $(".pageLogin .register .button").removeClass("disabled"); return; } else if (d.data === 1) { if (password != passwordVerify) { showNotification("Passwords do not match", 3000); $(".pageLogin .preloader").addClass("hidden"); + $(".pageLogin .register .button").removeClass("disabled"); return; } firebase @@ -171,9 +177,11 @@ function signUp() { } changePage("account"); usr.sendEmailVerification(); + $(".pageLogin .register .button").removeClass("disabled"); }) .catch(function (error) { // An error happened. + $(".pageLogin .register .button").removeClass("disabled"); console.error(error); usr .delete() @@ -193,6 +201,7 @@ function signUp() { }) .catch(function (error) { // Handle Errors here. + $(".pageLogin .register .button").removeClass("disabled"); var errorCode = error.code; var errorMessage = error.message; showNotification(errorMessage, 5000);