loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict filter not doing anything

Browse Source 
I'd forgotten to finish replacing usage of the data-conflicts body
attribute with the loot.filters.conflictTargetPluginName variable, so
the filter was actually given no plugin name. Fixes #529.
This commit is contained in:
Oliver Hamlet
2016-01-12 17:34:57 +00:00
parent 7ed9ce925c
commit 7fcbe0f95e
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/html/js/events.js
+12 -19
View File
@@ -45,7 +45,7 @@ function onChangeGame(evt) {
filter. Don't need to deactivate the others beforehand. Strictly not
deactivating the conflicts filter either, just resetting it's value.
*/
document.body.removeAttribute('data-conflicts');
loot.filters.conflictTargetPluginName = undefined;
/* Clear the UI of all existing game-specific data. Also
clear the card and li variables for each plugin object. */
@@ -105,18 +105,7 @@ function onUpdateMasterlist() {
}).catch(handlePromiseError);
}
function onSortPlugins() {
if (document.body.hasAttribute('data-conflicts')) {
/* Deactivate any existing plugin conflict filter. */
loot.game.plugins.forEach((plugin) => {
plugin.isConflictFilterChecked = false;
});
/* Un-highlight any existing filter plugin. */
const cards = document.getElementById('main').getElementsByTagName('loot-plugin-card');
for (let i = 0; i < cards.length; ++i) {
cards[i].classList.toggle('highlight', false);
}
document.body.removeAttribute('data-conflicts');
}
undoConflictsFilter();
let promise = Promise.resolve();
if (loot.settings.updateMasterlist) {
@@ -544,24 +533,28 @@ function onEditorClose(evt) {
document.getElementById('cardsNav').updateSize();
}).catch(handlePromiseError);
}
function onConflictsFilter(evt) {
function undoConflictsFilter() {
loot.filters.conflictTargetPluginName = undefined;
/* Deactivate any existing plugin conflict filter. */
loot.game.plugins.forEach((plugin) => {
if (plugin.id !== evt.target.id) {
plugin.isConflictFilterChecked = false;
}
plugin.isConflictFilterChecked = false;
});
/* Un-highlight any existing filter plugin. */
const cards = document.getElementById('main').getElementsByTagName('loot-plugin-card');
for (let i = 0; i < cards.length; ++i) {
cards[i].classList.toggle('highlight', false);
}
}
function onConflictsFilter(evt) {
/* Deactivate any existing plugin conflict filter. */
undoConflictsFilter();
/* evt.detail is true if the filter has been activated. */
if (evt.detail) {
document.body.setAttribute('data-conflicts', evt.target.getName());
evt.target.data.isConflictFilterChecked = true;
loot.filters.conflictTargetPluginName = evt.target.getName();
evt.target.classList.toggle('highlight', true);
} else {
document.body.removeAttribute('data-conflicts');
loot.filters.conflictTargetPluginName = undefined;
}
filterPluginData(loot.game.plugins, loot.filters);
}