From c42c779f809efa00e4016a25d4c134aa879dc440 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 May 2020 16:22:03 +0100 Subject: [PATCH] selected filters are now saved to the cookie --- public/index.html | 2 +- public/js/account.js | 25 ++++++++++++++++++------- public/js/userconfig.js | 6 +++++- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/public/index.html b/public/index.html index 23ab1b23e..17d06a41d 100644 --- a/public/index.html +++ b/public/index.html @@ -426,10 +426,10 @@ + - diff --git a/public/js/account.js b/public/js/account.js index e79630e1f..54d4b0f06 100644 --- a/public/js/account.js +++ b/public/js/account.js @@ -246,8 +246,17 @@ Object.keys(words).forEach(language => { .append(`
${language.replace('_',' ')}
`); }) -let activeFilters = []; -toggleFilterButton('all'); +let activeFilters = ["all"]; + + +$(document).ready(e =>{ + activeFilters = config.resultFilters; + console.log(activeFilters); + activeFilters.forEach(filter => { + enableFilterButton(filter); + }) +}) + function toggleFilterButton(filter){ const element = $(`.pageAccount .content .filterButtons .button[filter=${filter}]`); @@ -335,6 +344,13 @@ function updateActiveFilters(){ } +$('.pageAccount .filterButtons').click('.button',e =>{ + const filter = $(e.target).attr('filter'); + toggleFilterButton(filter); + config.resultFilters = activeFilters; + saveConfigToCookie(); +}) + function refreshAccountPage() { function cont(){ @@ -487,8 +503,3 @@ function refreshAccountPage() { cont(); } } - -$('.pageAccount .filterButtons').click('.button',e =>{ - const filter = $(e.target).attr('filter'); - toggleFilterButton(filter); -}) \ No newline at end of file diff --git a/public/js/userconfig.js b/public/js/userconfig.js index b6092d7d9..8ce475987 100644 --- a/public/js/userconfig.js +++ b/public/js/userconfig.js @@ -9,7 +9,8 @@ let config = { time: 30, mode: "words", language: "english", - fontSize: 1 + fontSize: 1, + resultFilters: ["all"] } //cookies @@ -33,6 +34,9 @@ function loadConfigFromCookie() { changeMode(newConfig.mode); changeLanguage(newConfig.language); changeFontSize(newConfig.fontSize); + if(newConfig.resultFilters == null || newConfig.resultFilters == undefined){ + newConfig.resultFilters = ["all"]; + } config = newConfig; restartTest(); }