From c3da5737229d12b7428ab44e3a0c0c54d11dc95c Mon Sep 17 00:00:00 2001
From: Oksana Melnik <oksana@dedact.nl>
Date: Fri, 25 Oct 2019 08:08:04 +0200
Subject: [PATCH] cleanup

---
 src/js/background/backgroundLogic.js |  6 +++---
 src/js/background/messageHandler.js  | 32 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 8542d52..1e40a29 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -113,12 +113,12 @@ const backgroundLogic = {
     return list.concat(containerState.hiddenTabs);
   },
 
-  async unhideContainer(cookieStoreId, toHide) {
+  async unhideContainer(cookieStoreId, alreadyShowingUrl) {
     if (!this.unhideQueue.includes(cookieStoreId)) {
       this.unhideQueue.push(cookieStoreId);
       await this.showTabs({
         cookieStoreId,
-        toHide
+        alreadyShowingUrl
       });
       this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1);
     }
@@ -311,7 +311,7 @@ const backgroundLogic = {
 
     for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
       // do not show already opened url
-      if (object.url !== options.toHide) {
+      if (object.url !== options.alreadyShowingUrl) {
         promises.push(this.openNewTab({
           userContextId: userContextId,
           url: object.url,
diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index a1027ae..a2a5e11 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -153,25 +153,25 @@ const messageHandler = {
             !tab.url.startsWith("moz-extension")) {
           // increment the counter of container tabs opened
           this.incrementCountOfContainerTabsOpened();
-        }
 
-        this.tabUpdateHandler = (tabId, changeInfo) => {
-          if (tabId === tab.id && changeInfo.status === "complete") {
-            // get current tab's url to not open the same one from hidden tabs
-            browser.tabs.get(tabId).then(loadedTab => {
-              backgroundLogic.unhideContainer(tab.cookieStoreId, loadedTab.url);
-            }).catch((e) => {
-              throw e;
-            });
+          this.tabUpdateHandler = (tabId, changeInfo) => {
+            if (tabId === tab.id && changeInfo.status === "complete") {
+              // get current tab's url to not open the same one from hidden tabs
+              browser.tabs.get(tabId).then(loadedTab => {
+                backgroundLogic.unhideContainer(tab.cookieStoreId, loadedTab.url);
+              }).catch((e) => {
+                throw e;
+              });
 
-            browser.tabs.onUpdated.removeListener(this.tabUpdateHandler);
+              browser.tabs.onUpdated.removeListener(this.tabUpdateHandler);
+            }
+          };
+
+          // if it's a container tab wait for it to complete and
+          // unhide other tabs from this container
+          if (tab.cookieStoreId.startsWith("firefox-container")) {
+            browser.tabs.onUpdated.addListener(this.tabUpdateHandler);
           }
-        };
-
-        // if it's a container tab wait for it to complete and
-        // unhide other tabs from this container
-        if (tab.cookieStoreId.startsWith("firefox-container")) {
-          browser.tabs.onUpdated.addListener(this.tabUpdateHandler);
         }
       }
       setTimeout(() => {