From ff5789d4aceb841ad653adc2ff2d0c6b2751633a Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sat, 9 Dec 2017 10:45:37 -0500
Subject: [PATCH] minor code review

---
 src/js/contentscript.js | 9 +++++----
 src/js/messaging.js     | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/js/contentscript.js b/src/js/contentscript.js
index f802287..0eb861d 100644
--- a/src/js/contentscript.js
+++ b/src/js/contentscript.js
@@ -67,7 +67,6 @@ vAPI.contentscriptEndInjected = true;
         if ( mustRemove ) {
             window.localStorage.clear();
             window.sessionStorage.clear();
-            // console.debug('HTTP Switchboard > found and removed non-empty localStorage');
         }
     };
 
@@ -76,12 +75,14 @@ vAPI.contentscriptEndInjected = true;
     // to site data is disabled.
     // https://github.com/gorhill/httpswitchboard/issues/215
     try {
-        var hasLocalStorage = window.localStorage && window.localStorage.length;
-        var hasSessionStorage = window.sessionStorage && window.sessionStorage.length;
+        var hasLocalStorage =
+            window.localStorage && window.localStorage.length !== 0;
+        var hasSessionStorage =
+            window.sessionStorage && window.sessionStorage.length !== 0;
         if ( hasLocalStorage || hasSessionStorage ) {
             vAPI.messaging.send('contentscript.js', {
                 what: 'contentScriptHasLocalStorage',
-                url: window.location.href
+                originURL: window.location.origin
             }, localStorageHandler);
         }
 
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 6fa1360..048ae52 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -426,19 +426,19 @@ var contentScriptSummaryHandler = function(tabId, details) {
 
 /******************************************************************************/
 
-var contentScriptLocalStorageHandler = function(tabId, pageURL) {
+var contentScriptLocalStorageHandler = function(tabId, originURL) {
     var tabContext = µm.tabContextManager.lookup(tabId);
     if ( tabContext === null ) { return; }
 
     var blocked = µm.mustBlock(
         tabContext.rootHostname,
-        µm.URI.hostnameFromURI(pageURL),
+        µm.URI.hostnameFromURI(originURL),
         'cookie'
     );
 
     var pageStore = µm.pageStoreFromTabId(tabId);
     if ( pageStore !== null ) {
-        var requestURL = µm.URI.originFromURI(pageURL) + '/{localStorage}';
+        var requestURL = originURL + '/{localStorage}';
         pageStore.recordRequest('cookie', requestURL, blocked);
         µm.logger.writeOne(tabId, 'net', tabContext.rootHostname, requestURL, 'cookie', blocked);
     }
@@ -520,7 +520,7 @@ var onMessage = function(request, sender, callback) {
 
     switch ( request.what ) {
     case 'contentScriptHasLocalStorage':
-        response = contentScriptLocalStorageHandler(tabId, request.url);
+        response = contentScriptLocalStorageHandler(tabId, request.originURL);
         break;
 
     case 'contentScriptSummary':