From c7e050182885543033ab61129ef73b8f59669519 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Thu, 12 May 2022 18:58:06 +0200 Subject: [PATCH] add soft init to reassign events --- .../static/js/main_inventory.build.js | 48 +++++++++++-------- ereuse_devicehub/static/js/main_inventory.js | 38 ++++++++++----- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.build.js b/ereuse_devicehub/static/js/main_inventory.build.js index a58a8260..48ab00a7 100644 --- a/ereuse_devicehub/static/js/main_inventory.build.js +++ b/ereuse_devicehub/static/js/main_inventory.build.js @@ -95,10 +95,27 @@ var _tableRowsPage = { writable: true, value: () => table.pages[table.rows().dt.currentPage - 1] }; -window.addEventListener("DOMContentLoaded", () => { + +const selectorController = action => { const btnSelectAll = document.getElementById("SelectAllBTN"); const alertInfoDevices = document.getElementById("select-devices-info"); + function softInit() { + TableController.getAllDevices().forEach(item => { + item.addEventListener("click", itemListCheckChanged); + }); // https://github.com/fiduswriter/Simple-DataTables/wiki/Events + + table.on("datatable.page", () => itemListCheckChanged()); + table.on("datatable.perpage", () => itemListCheckChanged()); + table.on("datatable.update", () => itemListCheckChanged()); + } + + if (action == "softInit") { + softInit(); + itemListCheckChanged(); + return; + } + function itemListCheckChanged() { alertInfoDevices.innerHTML = "Selected devices: ".concat(TableController.getSelectedDevices().length, "\n ").concat(TableController.getAllDevices().length != TableController.getSelectedDevices().length ? "Select all devices (".concat(TableController.getAllDevices().length, ")") : "Cancel selection"); @@ -128,9 +145,6 @@ window.addEventListener("DOMContentLoaded", () => { get_device_list(); } - TableController.getAllDevices().forEach(item => { - item.addEventListener("click", itemListCheckChanged); - }); btnSelectAll.addEventListener("click", event => { const checkedState = event.target.checked; TableController.getAllDevicesInCurrentPage().forEach(ckeckbox => { @@ -144,13 +158,12 @@ window.addEventListener("DOMContentLoaded", () => { ckeckbox.checked = !checkState; }); itemListCheckChanged(); - }); // https://github.com/fiduswriter/Simple-DataTables/wiki/Events - - table.on("datatable.page", () => itemListCheckChanged()); - table.on("datatable.perpage", () => itemListCheckChanged()); - table.on("datatable.update", () => itemListCheckChanged()); + }); + softInit(); itemListCheckChanged(); -}); +}; + +window.addEventListener("DOMContentLoaded", () => selectorController()); function deviceSelect() { const devices_count = TableController.getSelectedDevices().length; @@ -467,20 +480,13 @@ async function processSelectedDevices() { oldTable.parentElement.replaceChild(newTable, oldTable); table = new simpleDatatables.DataTable(newTable, { perPage: 20 - }); // https://github.com/fiduswriter/Simple-DataTables/wiki/rows()#removeselect-arraynumber - // const rowsToRemove = [] - // for (let i = 0; i < table.activeRows.length; i++) { - // const row = table.activeRows[i]; - // if (!newTable.includes(row.querySelector("input").attributes["data-device-dhid"].value)) { - // rowsToRemove.push(i) - // } - // } - // table.rows().remove(rowsToRemove); - // // Restore state of checkbox + }); // // Restore state of checkbox const selectAllBTN = document.getElementById("SelectAllBTN"); selectAllBTN.checked = false; - selectAllBTN.indeterminate = false; + selectAllBTN.indeterminate = false; // Re-init SelectorController + + selectorController("softInit"); } } diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index 00b90cd4..7a2ecc93 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -78,10 +78,28 @@ class TableController { /** * Select all functionality */ -window.addEventListener("DOMContentLoaded", () => { + +const selectorController = (action) => { const btnSelectAll = document.getElementById("SelectAllBTN"); const alertInfoDevices = document.getElementById("select-devices-info"); + function softInit() { + TableController.getAllDevices().forEach(item => { + item.addEventListener("click", itemListCheckChanged); + }) + + // https://github.com/fiduswriter/Simple-DataTables/wiki/Events + table.on("datatable.page", () => itemListCheckChanged()); + table.on("datatable.perpage", () => itemListCheckChanged()); + table.on("datatable.update", () => itemListCheckChanged()); + } + + if (action == "softInit") { + softInit(); + itemListCheckChanged(); + return; + } + function itemListCheckChanged() { alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length} ${TableController.getAllDevices().length != TableController.getSelectedDevices().length @@ -114,11 +132,7 @@ window.addEventListener("DOMContentLoaded", () => { get_device_list(); } - - TableController.getAllDevices().forEach(item => { - item.addEventListener("click", itemListCheckChanged); - }) - + btnSelectAll.addEventListener("click", event => { const checkedState = event.target.checked; TableController.getAllDevicesInCurrentPage().forEach(ckeckbox => { ckeckbox.checked = checkedState }); @@ -131,13 +145,12 @@ window.addEventListener("DOMContentLoaded", () => { itemListCheckChanged() }) - // https://github.com/fiduswriter/Simple-DataTables/wiki/Events - table.on("datatable.page", () => itemListCheckChanged()); - table.on("datatable.perpage", () => itemListCheckChanged()); - table.on("datatable.update", () => itemListCheckChanged()); + softInit(); itemListCheckChanged(); -}) +} + +window.addEventListener("DOMContentLoaded", () => selectorController()); function deviceSelect() { const devices_count = TableController.getSelectedDevices().length; @@ -439,6 +452,9 @@ async function processSelectedDevices() { const selectAllBTN = document.getElementById("SelectAllBTN"); selectAllBTN.checked = false; selectAllBTN.indeterminate = false; + + // Re-init SelectorController + selectorController("softInit"); } }