Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 20:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add [Ctrl] key action to combine filters.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-04-21 10:53:49 +02:00
parent 6fa9d036b4
commit e9ba5e440a
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/pi-hole/js/queries.js
View File

@@ -425,9 +425,13 @@ $(document).ready(function() {
initComplete: function() { initComplete: function() {
var api = this.api(); var api = this.api();
// Query type IPv4 / IPv6 // Query type IPv4 / IPv6
api.$("td:eq(1)").click(function() { api.$("td:eq(1)").click(function(event) {
if (autofilter()) { if (autofilter()) {
api.search("\\s"+this.textContent+"\\s", true, true).draw(); if(!event.ctrlKey) {
resetColumnsFilters();
}
console.log(event.ctrlKey);
api.column(1).search("^"+this.textContent+"$", true, true).draw();
$("#resetButton").show(); $("#resetButton").show();
} }
}); });
@@ -447,10 +451,13 @@ $(document).ready(function() {
); );
api.$("td:eq(1)").css("cursor", "pointer"); api.$("td:eq(1)").css("cursor", "pointer");
// Domain // Domain
api.$("td:eq(2)").click(function() { api.$("td:eq(2)").click(function(event) {
if (autofilter()) { if (autofilter()) {
if(!event.ctrlKey) {
resetColumnsFilters();
}
var domain = this.textContent.split("\n")[0]; var domain = this.textContent.split("\n")[0];
api.search("\\s"+domain+"\\s", true, true).draw(); api.column(2).search("^"+domain+"$", true, true).draw();
$("#resetButton").show(); $("#resetButton").show();
} }
}); });
@@ -471,10 +478,12 @@ $(document).ready(function() {
); );
api.$("td:eq(2)").css("cursor", "pointer"); api.$("td:eq(2)").css("cursor", "pointer");
// Client // Client
api.$("td:eq(3)").click(function() { api.$("td:eq(3)").click(function(event) {
if (autofilter()) { if (autofilter()) {
api.search("\\s"+this.textContent+"\\s", true, true).draw(); if(!event.ctrlKey) {
resetColumnsFilters();
}
api.column(3).search("^"+this.textContent+"$", true, true).draw();
$("#resetButton").show(); $("#resetButton").show();
} }
}); });
@@ -497,6 +506,7 @@ $(document).ready(function() {
}); });
// Initialize regex filter mode and clear search field (if set previously) // Initialize regex filter mode and clear search field (if set previously)
resetColumnsFilters();
tableApi.search("", true, true).draw(); tableApi.search("", true, true).draw();
$("#all-queries tbody").on("click", "button", function() { $("#all-queries tbody").on("click", "button", function() {
@@ -509,7 +519,8 @@ $(document).ready(function() {
}); });
$("#resetButton").click(function() { $("#resetButton").click(function() {
tableApi.search("", true, true).draw(); resetColumnsFilters();
tableApi.draw();
$("#resetButton").hide(); $("#resetButton").hide();
}); });
@@ -527,3 +538,10 @@ $(document).ready(function() {
localStorage.setItem("query_log_filter_chkbox", $("#autofilter").prop("checked")); localStorage.setItem("query_log_filter_chkbox", $("#autofilter").prop("checked"));
}); });
}); });
function resetColumnsFilters(add_filters) {
tableApi.columns()[0].forEach(index => {
tableApi.column(index).search("", true, true);
});
tableApi.draw();
}