From 49f42fca3ce7e3356f4e5a8b0a87e9ab78800011 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 18 Apr 2021 22:46:28 +0100 Subject: [PATCH] fixed filters getting overwritten with default filters, making loading useless. closes #1273 --- src/js/account.js | 1 + src/js/account/result-filters.js | 7 ++++--- src/js/exports.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/account.js b/src/js/account.js index 47225275c..3c0213ac0 100644 --- a/src/js/account.js +++ b/src/js/account.js @@ -287,6 +287,7 @@ let totalSecondsFiltered = 0; export function update() { function cont() { + console.log("updating account page"); ThemeColors.update(); ChartController.accountHistory.updateColors(); ChartController.accountActivity.updateColors(); diff --git a/src/js/account/result-filters.js b/src/js/account/result-filters.js index 1e2af5338..8a9a4f885 100644 --- a/src/js/account/result-filters.js +++ b/src/js/account/result-filters.js @@ -62,7 +62,7 @@ let defaultResultFilters = { }, }; -export let filters; +export let filters = defaultResultFilters; Promise.all([Misc.getLanguageList(), Misc.getFunboxList()]).then((values) => { let languages = values[0]; @@ -73,7 +73,7 @@ Promise.all([Misc.getLanguageList(), Misc.getFunboxList()]).then((values) => { funboxModes.forEach((funbox) => { defaultResultFilters.funbox[funbox.name] = true; }); - filters = defaultResultFilters; + // filters = defaultResultFilters; }); export function getFilters() { @@ -110,7 +110,7 @@ export function load() { // let newTags = $.cookie("activeTags"); try { let newResultFilters = window.localStorage.getItem("resultFilters"); - if (newResultFilters !== undefined && newResultFilters !== "") { + if (newResultFilters != undefined && newResultFilters !== "") { filters = JSON.parse(newResultFilters); save(); } else { @@ -118,6 +118,7 @@ export function load() { save(); } } catch { + console.log("error in loading result filters"); filters = defaultResultFilters; save(); } diff --git a/src/js/exports.js b/src/js/exports.js index 4df468469..91de5b101 100644 --- a/src/js/exports.js +++ b/src/js/exports.js @@ -11,4 +11,4 @@ global.config = Config; // global.addnotif = Notifications.add; global.link = AccountController.linkWithGoogle; -global.filters = ResultFilters.filters; +global.filters = ResultFilters.getFilters();