diff options
Diffstat (limited to 'js/PrefFilterTree.js')
| -rw-r--r-- | js/PrefFilterTree.js | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index f4fc8ecf2..0a8a2aa43 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -39,6 +39,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio const feed = this.model.store.getValue(item, 'feed'); const inverse = this.model.store.getValue(item, 'inverse'); + const last_triggered = this.model.store.getValue(item, 'last_triggered'); if (feed) label += " (" + __("in") + " " + feed + ")"; @@ -46,18 +47,18 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio if (inverse) label += " (" + __("Inverse") + ")"; + if (last_triggered) + label += " — " + last_triggered; + return label; }, getIconClass: function (item, opened) { return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible"; }, - getLabelClass: function (item, opened) { - const enabled = this.model.store.getValue(item, 'enabled'); - return (enabled != false) ? "dijitTreeLabel labelFixedLength" : "dijitTreeLabel labelFixedLength filterDisabled"; - }, getRowClass: function (item, opened) { - return (!item.error || item.error == '') ? "dijitTreeRow" : - "dijitTreeRow Error"; + const enabled = this.model.store.getValue(item, 'enabled'); + + return enabled ? "dijitTreeRow" : "dijitTreeRow filterDisabled"; }, checkItemAcceptance: function(target, source, position) { const item = dijit.getEnclosingWidget(target).item; @@ -100,7 +101,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio }); }, joinSelectedFilters: function() { - const rows = getSelectedFilters(); + const rows = this.getSelectedFilters(); if (rows.length == 0) { alert(__("No filters selected.")); @@ -153,24 +154,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio Filters.editFilterTest(query); }, selectRules: function (select) { - $$("#filterDlg_Matches input[type=checkbox]").each(function (e) { - e.checked = select; - if (select) - e.parentNode.addClassName("Selected"); - else - e.parentNode.removeClassName("Selected"); - }); + Lists.select("filterDlg_Matches", select); }, selectActions: function (select) { - $$("#filterDlg_Actions input[type=checkbox]").each(function (e) { - e.checked = select; - - if (select) - e.parentNode.addClassName("Selected"); - else - e.parentNode.removeClassName("Selected"); - - }); + Lists.select("filterDlg_Actions", select); }, editRule: function (e) { const li = e.parentNode; @@ -183,7 +170,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio Filters.addFilterAction(li, action); }, removeFilter: function () { - const msg = __("FRemove filter?"); + const msg = __("Remove filter?"); if (confirm(msg)) { this.hide(); |