From 2a067e5e52df95d247e8699bc43a5fda480f22e8 Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Tue, 19 Jun 2018 15:41:59 +0100
Subject: [PATCH] move select2 active logic into main js
---
.../src/javascript/components/submission-filters.js | 9 ---------
opentech/static_src/src/javascript/main.js | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opentech/static_src/src/javascript/components/submission-filters.js b/opentech/static_src/src/javascript/components/submission-filters.js
index 98fbc8d29..774230b59 100644
--- a/opentech/static_src/src/javascript/components/submission-filters.js
+++ b/opentech/static_src/src/javascript/components/submission-filters.js
@@ -54,13 +54,4 @@ export default () => {
mobileFilterPadding(dropdown);
});
});
-
- // wait for DOM content to load before checking for select2
- document.addEventListener('DOMContentLoaded', () => {
- // Add active class to select2 checkboxes after page has been filtered
- const clearButtons = document.querySelectorAll('.select2-selection__clear');
- clearButtons.forEach(clearButton => {
- clearButton.parentElement.parentElement.classList.add('is-active');
- });
- });
};
diff --git a/opentech/static_src/src/javascript/main.js b/opentech/static_src/src/javascript/main.js
index 9c976f747..06e4bb959 100755
--- a/opentech/static_src/src/javascript/main.js
+++ b/opentech/static_src/src/javascript/main.js
@@ -55,6 +55,15 @@ import mobileFilterPadding from './components/mobile-filter-padding';
submissionFilters();
});
+ // Add active class to select2 checkboxes after page has been filtered
+ document.addEventListener('DOMContentLoaded', () => {
+ // If there are clear buttons in the dom, it means the filters have been applied
+ const clearButtons = document.querySelectorAll('.select2-selection__clear');
+ clearButtons.forEach(clearButton => {
+ clearButton.parentElement.parentElement.classList.add('is-active');
+ });
+ });
+
// reset mobile filters if they're open past the tablet breakpoint
$(window).resize(function resize(){
if ($(window).width() < 768) {
--
GitLab