Merge pull request #707 from jonathanKingston/icon-reset-fix

Fix on update icons being reset to central defaults. Fixes #703

index.js

@@ -1028,6 +1028,8 @@ const ContainerService = {
       // Let's forget all the previous closed tabs.
       this._forgetIdentity();
 
+      this._resetContainerToCentralIcons();
+
       const preInstalledIdentities = data.preInstalledIdentities;
       ContextualIdentityProxy.getIdentities().forEach(identity => {
         if (!preInstalledIdentities.includes(identity.userContextId)) {
@@ -1326,8 +1328,6 @@ ContainerWindow.prototype = {
     this._shutdownFileMenu();
     this._shutdownAllTabsMenu();
     this._shutdownContextMenu();
-
-    this._shutdownContainers();
   },
 
   _shutDownPlusButtonMenuElement(buttonElement) {
@@ -1390,7 +1390,7 @@ ContainerWindow.prototype = {
     return true;
   },
 
-  _shutdownContainers() {
+  _resetContainerToCentralIcons() {
     ContextualIdentityProxy.getIdentities().forEach(identity => {
       if (IDENTITY_ICONS_STANDARD.indexOf(identity.icon) !== -1 &&
           IDENTITY_COLORS_STANDARD.indexOf(identity.color) !== -1) {

package.json

@@ -2,7 +2,7 @@
   "name": "testpilot-containers",
   "title": "Containers Experiment",
   "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/testpilot-containers/issues"

study.js

@@ -7,10 +7,15 @@ const { when: unload } = require("sdk/system/unload");
 
 const shield = require("./lib/shield/index");
 
+const surveyUrl = "https://www.surveygizmo.com/s3/3621810/shield-txp-containers";
+
 const studyConfig = {
   name: self.addonId,
   days: 28,
   surveyUrls: {
+    "end-of-study": surveyUrl,
+    "user-ended-study": surveyUrl,
+    ineligible: null,
   },
   variations: {
     "control": () => {},

webextension/css/popup.css

@@ -12,6 +12,7 @@
 }
 
 html {
+  background-color: #fefefe;
   box-sizing: border-box;
   font-size: 12px;
 }

webextension/js/confirm-page.js

@@ -82,6 +82,7 @@ load();
 async function openInContainer(redirectUrl, cookieStoreId) {
   const tab = await getCurrentTab();
   await browser.tabs.create({
+    index: tab[0].index + 1,
     cookieStoreId,
     url: redirectUrl
   });

webextension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Containers Experiment",
-  "version": "2.4.0",
+  "version": "2.5.0",
 
   "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
   "icons": {
@@ -35,7 +35,8 @@
   "commands": {
     "_execute_browser_action": {
       "suggested_key": {
-        "default": "Ctrl+Period"
+        "default": "Ctrl+Period",
+        "mac": "MacCtrl+Period"
       },
       "description": "Open containers panel"
     }