Replaced inactive plugin messages filter.

With an inactive plugins filter.
This commit is contained in:
Oliver Hamlet
2014-11-15 12:59:53 +00:00
parent 6d2a5bdf04
commit 32e015606e
3 changed files with 12 additions and 20 deletions
+9
View File
@@ -62,6 +62,14 @@ var filters = {
}
},
inactiveFilter: function(plugin) {
if (document.getElementById('hideInactivePlugins').checked) {
return plugin.isActive;
} else {
return true;
}
},
applyPluginFilters: function(plugins) {
var search = document.getElementById('searchBox').value.toLowerCase();
hiddenPluginNo = 0;
@@ -71,6 +79,7 @@ var filters = {
plugins.forEach(function(plugin){
/* Messageless filter needs to run first. */
if (this.messagelessFilter(plugin)
&& this.inactiveFilter(plugin)
&& this.searchFilter(plugin, search)) {
filteredPlugins.push(plugin);
+2 -19
View File
@@ -430,24 +430,7 @@ function applyFilters(evt) {
*/
getConflictingPluginsFromFilter().then(function(conflicts) {
for (var i = 0; i < cards.length; ++i) {
var isConflictingPlugin = false;
var hasInactivePluginMessages = false;
var messages = cards[i].getElementsByTagName('ul')[0].getElementsByTagName('li');
if (cards[i].getAttribute('data-active') == 'false') {
hasInactivePluginMessages = true;
}
if (conflicts.indexOf(cards[i].getName()) != -1) {
isConflictingPlugin = true;
}
for (var j = 0; j < messages.length; ++j) {
if (document.getElementById('hideInactivePluginMessages').checked && hasInactivePluginMessages) {
hideElement(messages[j]);
++hiddenMessageNo;
} else {
showElement(messages[j]);
}
}
if (conflicts.length > 0 && !isConflictingPlugin) {
if (conflicts.length > 0 && !conflicts.indexOf(cards[i].getName()) != -1) {
hideElement(cards[i]);
hideElement(entries[i]);
++hiddenPluginNo;
@@ -1107,7 +1090,7 @@ function setupEventHandlers() {
document.getElementById('hideBashTags').addEventListener('change', toggleDisplayCSS, false);
document.getElementById('hideNotes').addEventListener('change', setFilteredUIData, false);
document.getElementById('hideDoNotCleanMessages').addEventListener('change', setFilteredUIData, false);
document.getElementById('hideInactivePluginMessages').addEventListener('change', applyFilters, false);
document.getElementById('hideInactivePlugins').addEventListener('change', setFilteredUIData, false);
document.getElementById('hideAllPluginMessages').addEventListener('change', setFilteredUIData, false);
document.getElementById('hideMessagelessPlugins').addEventListener('change', setFilteredUIData, false);
document.body.addEventListener('loot-filter-conflicts', handleConflictsFilter, false);
+1 -1
View File
@@ -125,8 +125,8 @@
<paper-checkbox id="hideBashTags" data-class="tag" label="Hide Bash Tags"></paper-checkbox>
<paper-checkbox id="hideNotes" label="Hide notes"></paper-checkbox>
<paper-checkbox id="hideDoNotCleanMessages" label="Hide 'Do not clean' messages"></paper-checkbox>
<paper-checkbox id="hideInactivePluginMessages" label="Hide inactive plugin messages"></paper-checkbox>
<paper-checkbox id="hideAllPluginMessages" label="Hide all plugin messages"></paper-checkbox>
<paper-checkbox id="hideInactivePlugins" label="Hide inactive plugins"></paper-checkbox>
<paper-checkbox id="hideMessagelessPlugins" label="Hide messageless plugins"></paper-checkbox>
<div center horizontal layout>
<div id="hiddenPluginsTxt" flex>Hidden plugins:</div>