From e025afe8eaec530f9e579ed89c8db9b1bfc15a2c Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Wed, 6 May 2015 18:31:13 -0400
Subject: [PATCH] allow cleaning up voided rows

---
 src/css/logger-ui.css |  4 +++
 src/js/logger-ui.js   | 65 ++++++++++++++++++++++++++++++++-----------
 src/js/messaging.js   |  8 +++++-
 src/logger-ui.html    |  3 +-
 4 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css
index f01a03c..2d75d84 100644
--- a/src/css/logger-ui.css
+++ b/src/css/logger-ui.css
@@ -32,6 +32,10 @@ body {
     margin: 0;
     padding: 8px;
     }
+#toolbar .button.disabled {
+    opacity: 0.2;
+    pointer-events: none;
+    }
 #toolbar .button:hover {
     background-color: #eee;
     }
diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js
index 880a250..2b1e63d 100644
--- a/src/js/logger-ui.js
+++ b/src/js/logger-ui.js
@@ -234,18 +234,25 @@ var renderLogEntry = function(entry) {
 
 /******************************************************************************/
 
-var renderLogBuffer = function(response) {
-    var buffer = response.entries;
-    if ( buffer.length === 0 ) {
+var renderLogEntries = function(response) {
+    var entries = response.entries;
+    if ( entries.length === 0 ) {
         return;
     }
 
     // Preserve scroll position
     var height = tbody.offsetHeight;
 
-    var n = buffer.length;
+    var tabIds = response.tabIds;
+    var n = entries.length;
+    var entry;
     for ( var i = 0; i < n; i++ ) {
-        renderLogEntry(buffer[i]);
+        entry = entries[i];
+        // Unlikely, but it may happen
+        if ( entry.tab && tabIds.hasOwnProperty(entry.tab) === false ) {
+            continue;
+        }
+        renderLogEntry(entries[i]);
     }
 
     // Prevent logger from growing infinitely and eating all memory. For
@@ -303,25 +310,37 @@ var onLogBufferRead = function(response) {
 
     // Neuter rows for which a tab does not exist anymore
     // TODO: sort to avoid using indexOf
-    var targetTabId;
-    var i = allTabIds.length;
-    while ( i-- ) {
-        targetTabId = allTabIds[i];
-        if ( targetTabId === noTabId ) {
+    var rowVoided = false;
+    for ( var tabId in allTabIds ) {
+        if ( allTabIds.hasOwnProperty(tabId) === false ) {
             continue;
         }
-        if ( response.allTabIds.indexOf(targetTabId) !== -1 ) {
+        if ( response.tabIds.hasOwnProperty(tabId) ) {
             continue;
         }
-        uDom('.tab_' + targetTabId).removeClass('canMtx');
-        // Close popup if it is currently inspecting this tab
-        if ( targetTabId === popupManager.tabId ) {
+        uDom('.tab_' + tabId).removeClass('canMtx');
+        if ( tabId === popupManager.tabId ) {
             popupManager.toggleOff();
         }
+        rowVoided = true;
+    }
+    allTabIds = response.tabIds;
+
+    renderLogEntries(response);
+
+    if ( rowVoided ) {
+        uDom('#clean').toggleClass(
+            'disabled',
+            tbody.querySelector('tr.tab:not(.canMtx)') === null
+        );
     }
-    allTabIds = response.allTabIds;
 
-    renderLogBuffer(response);
+    // Synchronize toolbar with content of log
+    uDom('#clear').toggleClass(
+        'disabled',
+        tbody.querySelector('tr') === null
+    );
+
     setTimeout(readLogBuffer, 1200);
 };
 
@@ -343,6 +362,19 @@ var clearBuffer = function() {
         tr = tbody.lastElementChild;
         trJunkyard.push(tbody.removeChild(tr));
     }
+    uDom('#clear').addClass('disabled');
+    uDom('#clean').addClass('disabled');
+};
+
+/******************************************************************************/
+
+var cleanBuffer = function() {
+    var rows = uDom('#content tr.tab:not(.canMtx)').remove();
+    var i = rows.length;
+    while ( i-- ) {
+        trJunkyard.push(rows.nodeAt(i));
+    }
+    uDom('#clean').addClass('disabled');
 };
 
 /******************************************************************************/
@@ -589,6 +621,7 @@ uDom.onLoad(function() {
     readLogBuffer();
 
     uDom('#compactViewToggler').on('click', toggleCompactView);
+    uDom('#clean').on('click', cleanBuffer);
     uDom('#clear').on('click', clearBuffer);
     uDom('#maxEntries').on('change', onMaxEntriesChanged);
     uDom('#content table').on('click', 'tr.canMtx > td:nth-of-type(2)', popupManager.toggleOn);
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 7e49501..59abacf 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -977,12 +977,18 @@ var onMessage = function(request, sender, callback) {
 
     switch ( request.what ) {
         case 'readMany':
+            var tabIds = {};
+            for ( var tabId in µm.pageStores ) {
+                if ( µm.pageStores.hasOwnProperty(tabId) ) {
+                    tabIds[tabId] = true;
+                }
+            }
             response = {
                 colorBlind: false,
                 entries: µm.logger.readAll(),
                 maxLoggedRequests: µm.userSettings.maxLoggedRequests,
                 noTabId: vAPI.noTabId,
-                allTabIds: Object.keys(µm.pageStores)
+                tabIds: tabIds
             };
             break;
 
diff --git a/src/logger-ui.html b/src/logger-ui.html
index f6315ac..8cb8831 100644
--- a/src/logger-ui.html
+++ b/src/logger-ui.html
@@ -10,7 +10,8 @@
 
 <div id="toolbar">
     <span id="compactViewToggler" class="button fa"></span>
-    <span id="clear" class="button fa">&#xf12d;</span>
+    <span id="clean" class="button fa disabled">&#xf00d;</span>
+    <span id="clear" class="button fa disabled">&#xf12d;</span>
     <span id="filterButton" class="button fa">&#xf0b0;</span><input id="filterExpression" type="text" placeholder="logFilterPrompt">
     <input id="maxEntries" type="text" size="5" title="logMaxEntriesTip">
     </div>