From c31bf1f0c8864b2556911e4ec0406110312a175e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 19 Mar 2021 15:59:28 -0700 Subject: [PATCH] Fixes loading javascript listeners --- bookwyrm/static/js/check_all.js | 7 ------- bookwyrm/static/js/localstorage.js | 10 ---------- bookwyrm/static/js/shared.js | 18 ++++++++++++++++++ bookwyrm/static/js/tabs.js | 7 ------- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js index 1d02f6b0b..ea2300ced 100644 --- a/bookwyrm/static/js/check_all.js +++ b/bookwyrm/static/js/check_all.js @@ -1,11 +1,4 @@ // Toggle all checkboxes. -window.onload = function() { - document - .querySelectorAll('[data-action="toggle-all"]') - .forEach(input => { - input.addEventListener('change', toggleAllCheckboxes); - }); -}; /** * Toggle all descendant checkboxes of a target. diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js index ff4027e68..b63c43928 100644 --- a/bookwyrm/static/js/localstorage.js +++ b/bookwyrm/static/js/localstorage.js @@ -1,14 +1,4 @@ // set javascript listeners -window.onload = function() { - // display based on localstorage vars - document.querySelectorAll('[data-hide]') - .forEach(t => setDisplay(t)); - - // update localstorage - Array.from(document.getElementsByClassName('set-display')) - .forEach(t => t.onclick = updateDisplay); -}; - function updateDisplay(e) { // used in set reading goal var key = e.target.getAttribute('data-id'); diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js index 97767d720..d390f482f 100644 --- a/bookwyrm/static/js/shared.js +++ b/bookwyrm/static/js/shared.js @@ -23,6 +23,24 @@ window.onload = function() { // browser back behavior document.querySelectorAll('[data-back]') .forEach(t => t.onclick = back); + + Array.from(document.getElementsByClassName('tab-group')) + .forEach(t => new TabGroup(t)); + + // display based on localstorage vars + document.querySelectorAll('[data-hide]') + .forEach(t => setDisplay(t)); + + // update localstorage + Array.from(document.getElementsByClassName('set-display')) + .forEach(t => t.onclick = updateDisplay); + + // Toggle all checkboxes. + document + .querySelectorAll('[data-action="toggle-all"]') + .forEach(input => { + input.addEventListener('change', toggleAllCheckboxes); + }); }; function back(e) { diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js index e32312a3a..1cb525ce9 100644 --- a/bookwyrm/static/js/tabs.js +++ b/bookwyrm/static/js/tabs.js @@ -1,10 +1,3 @@ -// tab groups -window.onload = function() { - Array.from(document.getElementsByClassName('tab-group')) - .forEach(t => new TabGroup(t)); -}; - - /* * The content below is licensed according to the W3C Software License at * https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document