rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix on update icons being reset to central defaults. Fixes #703
This commit is contained in:
luke crouch 2017-08-03 16:05:54 +00:00 • committed by GitHub
commit e3ed4582d2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
index.js
View file

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

2
package.json
View file

@ -2,7 +2,7 @@
"name": "testpilot-containers", "name": "testpilot-containers",
"title": "Containers Experiment", "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.", "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.1", "version": "2.5.0",
"author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston", "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
"bugs": { "bugs": {
"url": "https://github.com/mozilla/testpilot-containers/issues" "url": "https://github.com/mozilla/testpilot-containers/issues"

2
webextension/manifest.json
View file

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Containers Experiment", "name": "Containers Experiment",
"version": "2.4.1", "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.", "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": { "icons": {