add container tab for dispatch IRC

_locales/en/messages.json

@@ -159,12 +159,12 @@
     "message": "Web Browser (Private)",
     "description": "Preface for the browser titlebar"
   },
-  "localPreface": {
-    "message": "Localhost Browser",
+  "ircPreface": {
+    "message": "Dispatch IRC",
     "description": "Preface for the browser titlebar"
   },
-  "localPrefacePrivate": {
-    "message": "Localhost Browser (Private)",
+  "ircPrefacePrivate": {
+    "message": "Dispatch IRC (Private)",
     "description": "Preface for the browser titlebar"
   },
   "routerPreface": {

background.js

@@ -10,8 +10,8 @@ var torrentpref = chrome.i18n.getMessage('torrentPreface');
 var torrentprefpriv = chrome.i18n.getMessage('torrentPrefacePrivate');
 var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
 var tunnelprefpriv = chrome.i18n.getMessage('i2ptunnelPrefacePrivate');
-var localpref = chrome.i18n.getMessage('localPreface');
-var localprefpriv = chrome.i18n.getMessage('localPrefacePrivate');
+var localpref = chrome.i18n.getMessage('ircPreface');
+var ircprefpriv = chrome.i18n.getMessage('ircPrefacePrivate');
 var extensionpref = chrome.i18n.getMessage('extensionPreface');
 var muwirepref = chrome.i18n.getMessage('muwirePreface');
 
@@ -76,16 +76,16 @@ function onContextsGot(contexts) {
       })
       .then(onCreated, onNotCreated);
   }
-  if (ids.indexOf(localpref) == -1) {
+  if (ids.indexOf(ircpref) == -1) {
     browser.contextualIdentities
       .create({
-        name: localpref,
+        name: ircpref,
         color: 'red',
-        icon: 'fence'
+        icon: 'vacation'
       })
       .then(onCreated, onNotCreated);
   }
-  if (ids.indexOf(localpref) == -1) {
+  if (ids.indexOf(muwirepref) == -1) {
     browser.contextualIdentities
       .create({
         name: muwirepref,
@@ -363,16 +363,16 @@ function setTitle(window) {
             titlePreface: titlepref + ' - ' + torrentpref + ': '
           });
         }
-      } else if (context.name == localpref) {
-        console.log('Active in Localhost window');
+      } else if (context.name == ircpref) {
+        console.log('Active in IRC window');
 
         if (window.incognito) {
           browser.windows.update(window.id, {
-            titlePreface: localprefpriv + ' - ' + localprefpriv + ': '
+            titlePreface: ircprefpriv + ' - ' + ircprefpriv + ': '
           });
         } else {
           browser.windows.update(window.id, {
-            titlePreface: localpref + ' - ' + localpref + ': '
+            titlePreface: ircpref + ' - ' + ircpref + ': '
           });
         }
       }

scrub.js

@@ -4,7 +4,7 @@ var routerpref = chrome.i18n.getMessage('routerPreface');
 var mailpref = chrome.i18n.getMessage('mailPreface');
 var torrentpref = chrome.i18n.getMessage('torrentPreface');
 var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
-var localpref = chrome.i18n.getMessage('localPreface');
+var ircpref = chrome.i18n.getMessage('ircPreface');
 var extensionpref = chrome.i18n.getMessage('extensionPreface');
 var muwirepref = chrome.i18n.getMessage('muwirePreface');
 
@@ -106,7 +106,7 @@ var notMyContextNotMyProblem = async function() {
     name: tunnelpref
   });
   var context6 = await browser.contextualIdentities.query({
-    name: localpref
+    name: ircpref
   });
   var context7 = await browser.contextualIdentities.query({
     name: muwirepref
@@ -423,39 +423,49 @@ var contextSetup = function(requestDetails) {
         console.log('(isolate)Context Error', error);
       }
     };
-    /*var localTabFind = async function(tabId) {
+    var ircTabFind = async function(tabId) {
       try {
         var context = await browser.contextualIdentities.query({
-          name: localpref
+          name: ircpref
         });
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab() {
-                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
+          if (requestDetails.url.includes(':7669')) {
+            function Create() {
+              function onCreated(tab) {
+                function closeOldTab(tabs) {
+                  if (tabId.id != tab.id) {
+                    console.log('(isolate) Closing un-isolated tab', tabId.id);
+                    console.log('in favor of', tab.id);
+                    console.log('with context', tab.cookieStoreId);
+                    browser.tabs.remove(tabId.id);
+                  }
+                  for (index = 0; index < tabs.length; index++) {
+                    if (index != tabs.length - 1)
+                      browser.tabs.remove(tabs[index].id);
+                  }
                 }
+                var pins = browser.tabs.query({
+                  cookieStoreId: context[0].cookieStoreId
+                });
+                pins.then(closeOldTab, onError);
               }
-              closeOldTab(tab);
+              var created = browser.tabs.create({
+                active: true,
+                pinned: true,
+                cookieStoreId: context[0].cookieStoreId,
+                url: requestDetails.url
+              });
+              created.then(onCreated, onContextError);
             }
-            var created = browser.tabs.create({
-              active: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url
-            });
-            created.then(onCreated, onContextError);
+            var gettab = browser.tabs.get(tabId.id);
+            gettab.then(Create, onContextError);
+            return tabId;
           }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
         }
       } catch (error) {
         console.log('(isolate)Context Error', error);
       }
-    };*/
+    };
     var normalTabFind = async function(tabId) {
       if (tabId == undefined) {
         return;
@@ -464,8 +474,8 @@ var contextSetup = function(requestDetails) {
         var anoncontext = await browser.contextualIdentities.query({
           name: titlepref
         });
-        var localcontext = await browser.contextualIdentities.query({
-          name: localpref
+        var irccontext = await browser.contextualIdentities.query({
+          name: ircpref
         });
         var othercontexts = await notMyContextNotMyProblem();
         var nmp = false;
@@ -479,7 +489,7 @@ var contextSetup = function(requestDetails) {
           tabId.cookieStoreId == 'firefox-default' ||
           tabId.cookieStoreId == 'firefox-private' ||
           tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
-          tabId.cookieStoreId == localcontext[0].cookieStoreId ||
+          tabId.cookieStoreId == irccontext[0].cookieStoreId ||
           nmp
         ) {
           console.log(
@@ -487,7 +497,7 @@ var contextSetup = function(requestDetails) {
             tabId.cookieStoreId,
             'not',
             anoncontext[0].cookieStoreId,
-            localcontext[0].cookieStoreId
+            irccontext[0].cookieStoreId
           );
           return;
         } else {
@@ -587,10 +597,10 @@ var contextSetup = function(requestDetails) {
           return requestDetails;
         }
       } else {
-        /*if (localhost) {
-          var localtab = tab.then(localTabFind, onContextError);
+        if (localhost) {
+          var irctab = tab.then(ircTabFind, onContextError);
           return requestDetails;
-        }*/
+        }
         var normalTab = tab.then(normalTabFind, onContextError);
         return requestDetails;
         //return requestDetails;