Fix filtering again

Heath123 · Apr 13, 2021 · 9cc4377 · 9cc4377
1 parent 888ae16
commit 9cc4377
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/html/mainPage/js/filteringLogic.js b/html/mainPage/js/filteringLogic.js
@@ -1,9 +1,10 @@
-exports.packetFilteredByFilterBox = function (packet, filter, hiddenPackets, inverseFiltering, regexFilter) {
+exports.packetFilteredByFilterBox = function (packet, filter, hiddenPackets, inverseFiltering, regexFilter,
+  sharedVars) {
   if (hiddenPackets[packet.direction].includes(packet.meta.name)) {
     return true
   }
 
-  if (filter === '') {
+  if (sharedVars.lastFilter === '') {
     return false
   }
 
@@ -14,6 +15,7 @@ exports.packetFilteredByFilterBox = function (packet, filter, hiddenPackets, inv
       filter = new RegExp(sharedVars.lastFilter)
     } catch (err) {
       // TODO: handle
+      console.error(err)
       filter = new RegExp("")
     }
   }

diff --git a/html/mainPage/js/main.js b/html/mainPage/js/main.js
@@ -80,16 +80,17 @@ function updateFiltering () {
       regex = new RegExp(sharedVars.lastFilter)
     } catch (err) {
       // TODO: handle
+      console.error(err)
       regex = new RegExp("")
     }
   }
   sharedVars.allPacketsHTML.forEach(function (item, index, array) {
-    if (sharedVars.lastFilter === '' ||
-          !filteringLogic.packetFilteredByFilterBox(sharedVars.allPackets[index],
+    if (!filteringLogic.packetFilteredByFilterBox(sharedVars.allPackets[index],
           regexFilter ? regex : sharedVars.lastFilter,
           sharedVars.hiddenPackets,
           inverseFiltering,
-          regexFilter)) {
+          regexFilter,
+          sharedVars)) {
       // If it's hidden, show it
       array[index] = [item[0].replace('filter-hidden', 'filter-shown')]
     } else {

diff --git a/html/mainPage/js/packetDom.js b/html/mainPage/js/packetDom.js
@@ -39,7 +39,8 @@ function formatTime (ms) {
 exports.addPacketToDOM = function (packet) {
   const isHidden = filteringLogic.packetFilteredByFilterBox(packet, sharedVars.lastFilter, sharedVars.hiddenPackets,
     // TODO: cache these?
-    sharedVars.settings.getSetting('inverseFiltering'), sharedVars.settings.getSetting('regexFilter'))
+    sharedVars.settings.getSetting('inverseFiltering'), sharedVars.settings.getSetting('regexFilter'),
+    sharedVars)
   sharedVars.allPacketsHTML.push([
     `<li id="packet${packet.uid}" onclick="packetClick(${packet.uid})" class="packet ${packet.direction} ${isHidden ? 'filter-hidden' : 'filter-shown'}">
         <div class="main-data">