From 1015879f8f9537b18cb69b9fe1204437dc6184e3 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Wed, 8 Jun 2016 21:19:58 +0100 Subject: [PATCH] Fix deactivating conflicts filter programmatically It wasn't updating the selected item in the dropdown. --- src/gui/html/js/filters.js | 6 ++++++ src/gui/html/js/initialise.js | 1 + 2 files changed, 7 insertions(+) diff --git a/src/gui/html/js/filters.js b/src/gui/html/js/filters.js index db5dd52f..ed32a324 100644 --- a/src/gui/html/js/filters.js +++ b/src/gui/html/js/filters.js @@ -73,6 +73,8 @@ this.conflictingPluginNames = []; + document.dispatchEvent(new CustomEvent('loot-filter-conflicts-deactivate')); + return wasEnabled; } @@ -113,4 +115,8 @@ list.appendChild(item); }); } + + static onDeactivateConflictsFilter() { + document.getElementById('conflictsFilter').value = ''; + } })); diff --git a/src/gui/html/js/initialise.js b/src/gui/html/js/initialise.js index 2def7ef3..79a12483 100644 --- a/src/gui/html/js/initialise.js +++ b/src/gui/html/js/initialise.js @@ -51,6 +51,7 @@ document.getElementById('hideMessagelessPlugins').addEventListener('change', onSidebarFilterToggle); document.getElementById('contentFilter').addEventListener('change', onSidebarFilterToggle); document.getElementById('conflictsFilter').addEventListener('iron-select', onConflictsFilter); + document.addEventListener('loot-filter-conflicts-deactivate', Filters.onDeactivateConflictsFilter); /* Set up handlers for buttons. */ document.getElementById('redatePluginsButton').addEventListener('click', onRedatePlugins);