From a06f49f79109b5cd39c13bea705faf4dddad2291 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 10 Sep 2016 11:14:23 +1200 Subject: [PATCH] Fix footer entities count not being updated when change filter value --- scripts/system/html/js/entityList.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index b7787b41dd..7471e171fc 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -206,10 +206,23 @@ function loaded() { EventBridge.emitWebEvent(JSON.stringify({ type: 'refresh' })); } + function refreshFooter() { + if (selectedEntities.length > 1) { + elFooter.firstChild.nodeValue = selectedEntities.length + " entities selected"; + } else if (selectedEntities.length === 1) { + elFooter.firstChild.nodeValue = "1 entity selected"; + } else if (entityList.visibleItems.length === 1) { + elFooter.firstChild.nodeValue = "1 entity found"; + } else { + elFooter.firstChild.nodeValue = entityList.visibleItems.length + " entities found"; + } + } + function refreshEntityListObject() { refreshEntityListTimer = null; entityList.sort(currentSortColumn, { order: currentSortOrder }); entityList.search(elFilter.value); + refreshFooter(); } function updateSelectedEntities(selectedEntities) { @@ -227,16 +240,6 @@ function loaded() { } } - if (selectedEntities.length > 1) { - elFooter.firstChild.nodeValue = selectedEntities.length + " entities selected"; - } else if (selectedEntities.length === 1) { - elFooter.firstChild.nodeValue = "1 entity selected"; - } else if (entityList.visibleItems.length === 1) { - elFooter.firstChild.nodeValue = "1 entity found"; - } else { - elFooter.firstChild.nodeValue = entityList.visibleItems.length + " entities found"; - } - // HACK: Fixes the footer and header text sometimes not displaying after adding or deleting entities. // The problem appears to be a bug in the Qt HTML/CSS rendering (Qt 5.5). document.getElementById("radius").focus(); @@ -371,6 +374,7 @@ function loaded() { window.onresize = resize; elFilter.onchange = resize; + elFilter.onblur = refreshFooter; var showExtraInfo = false;