From c23c05a6ce11790ee36cbadc706db96ee60a6a96 Mon Sep 17 00:00:00 2001 From: John Gruen Date: Mon, 20 Feb 2017 21:39:01 -0500 Subject: [PATCH 1/7] fix linter errors --- index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index f01122f..779e484 100644 --- a/index.js +++ b/index.js @@ -243,22 +243,22 @@ const ContainerService = { color: "", name: "Pending to be deleted", public: true, - } + }; } return identity; } - let oldGetIdentityFromId = ContextualIdentityService.getIdentityFromId; + const oldGetIdentityFromId = ContextualIdentityService.getIdentityFromId; ContextualIdentityService.getIdentityFromId = function(userContextId) { return workaroundForCookieManager(oldGetIdentityFromId, userContextId); - } + }; if ("getPublicIdentityFromId" in ContextualIdentityService) { - let oldGetPublicIdentityFromId = ContextualIdentityService.getIdentityFromId; + const oldGetPublicIdentityFromId = ContextualIdentityService.getIdentityFromId; ContextualIdentityService.getIdentityFromId = function(userContextId) { return workaroundForCookieManager(oldGetPublicIdentityFromId, userContextId); - } + }; } // End-Of-Hack }, From 4cd565e2c8cefd60e74269883544ab39baab5ed5 Mon Sep 17 00:00:00 2001 From: groovecoder Date: Tue, 21 Feb 2017 10:50:49 -0600 Subject: [PATCH 2/7] .jpmignore .xpis; updateURL in package.json; 0.9.2 --- .jpmignore | 3 ++- package.json | 5 +++-- webextension/manifest.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.jpmignore b/.jpmignore index 0fc6d0e..100666b 100644 --- a/.jpmignore +++ b/.jpmignore @@ -5,12 +5,13 @@ node_modules/ .env .eslintrc.js +.eslintignore .gitignore .htmllintrc .jpmignore .stylelintrc .travis.yml -testpilot-containers.xpi +*.xpi .vimrc .DS_Store .gdb_history diff --git a/package.json b/package.json index 18f560b..0676256 100644 --- a/package.json +++ b/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": "0.9.0", + "version": "0.9.1", "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston", "bugs": { "url": "https://github.com/mozilla/testpilot-containers/issues" @@ -44,5 +44,6 @@ "lint:html": "htmllint webextension/*.html", "lint:js": "eslint .", "test": "npm run lint" - } + }, + "updateURL": "https://testpilot.firefox.com/files/@testpilot-containers/updates.json" } diff --git a/webextension/manifest.json b/webextension/manifest.json index 095eec6..9e97d1a 100644 --- a/webextension/manifest.json +++ b/webextension/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Containers Experiment", - "version": "0.9.0", + "version": "0.9.1", "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": { From c64c945e2c2b18bef4fefb7c791727684633d9ea Mon Sep 17 00:00:00 2001 From: groovecoder Date: Tue, 21 Feb 2017 10:51:41 -0600 Subject: [PATCH 3/7] version 0.9.2 --- package.json | 2 +- webextension/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0676256..eb0180f 100644 --- a/package.json +++ b/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": "0.9.1", + "version": "0.9.2", "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston", "bugs": { "url": "https://github.com/mozilla/testpilot-containers/issues" diff --git a/webextension/manifest.json b/webextension/manifest.json index 9e97d1a..fd0546a 100644 --- a/webextension/manifest.json +++ b/webextension/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Containers Experiment", - "version": "0.9.1", + "version": "0.9.2", "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": { From e41b018e370d761561ddfee106e323100b3a9130 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Mon, 20 Feb 2017 22:09:16 +0000 Subject: [PATCH 4/7] Make container popup colours match other areas. --- webextension/css/popup.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/webextension/css/popup.css b/webextension/css/popup.css index cdb0a99..eb51f06 100644 --- a/webextension/css/popup.css +++ b/webextension/css/popup.css @@ -37,18 +37,18 @@ table { /* Color and icon helpers */ [data-identity-color="blue"] { - --identity-tab-color: #0996f8; - --identity-icon-color: #00a7e0; + --identity-tab-color: #37adff; + --identity-icon-color: #37adff; } [data-identity-color="turquoise"] { - --identity-tab-color: #01bdad; - --identity-icon-color: #01bdad; + --identity-tab-color: #00c79a; + --identity-icon-color: #00c79a; } [data-identity-color="green"] { - --identity-tab-color: #57bd35; - --identity-icon-color: #7dc14c; + --identity-tab-color: #51cd00; + --identity-icon-color: #51cd00; } [data-identity-color="yellow"] { @@ -57,23 +57,23 @@ table { } [data-identity-color="orange"] { - --identity-tab-color: #ff9216; - --identity-icon-color: #ff9216; + --identity-tab-color: #ff9f00; + --identity-icon-color: #ff9f00; } [data-identity-color="red"] { - --identity-tab-color: #d92215; - --identity-icon-color: #d92215; + --identity-tab-color: #ff613d; + --identity-icon-color: #ff613d; } [data-identity-color="pink"] { - --identity-tab-color: #ea385e; - --identity-icon-color: #ee5195; + --identity-tab-color: #ff4bda; + --identity-icon-color: #ff4bda; } [data-identity-color="purple"] { - --identity-tab-color: #7a2f7a; - --identity-icon-color: #7a2f7a; + --identity-tab-color: #af51f5; + --identity-icon-color: #af51f5; } [data-identity-icon="fingerprint"] { From d6c1b7e070933a657e49699f80e161d02492ce33 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Tue, 21 Feb 2017 01:58:40 +0000 Subject: [PATCH 5/7] Fixing accessibility of edit containers radio buttons. Fixes #223 --- webextension/css/popup.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webextension/css/popup.css b/webextension/css/popup.css index eb51f06..612738c 100644 --- a/webextension/css/popup.css +++ b/webextension/css/popup.css @@ -520,6 +520,11 @@ span ~ .panel-header-text { opacity: 0 !important; } +.edit-container-panel [type="radio"] { + display: inline; + opacity: 0; +} + .edit-container-panel [type="radio"]:checked + label { outline: 2px solid grey; -moz-outline-radius: 50px; From b3e5ce6d7baeddc887641b7a4ddc13242ed40a71 Mon Sep 17 00:00:00 2001 From: John Gruen Date: Tue, 21 Feb 2017 14:14:22 -0500 Subject: [PATCH 6/7] add four moreicons --- data/usercontext.css | 16 ++++++++++++++++ data/usercontext.svg | 18 ++++++++++++++++++ index.js | 4 ++++ webextension/css/popup.css | 16 ++++++++++++++++ webextension/img/usercontext.svg | 18 ++++++++++++++++++ webextension/js/popup.js | 2 +- 6 files changed, 73 insertions(+), 1 deletion(-) diff --git a/data/usercontext.css b/data/usercontext.css index a16c07e..6599562 100644 --- a/data/usercontext.css +++ b/data/usercontext.css @@ -90,6 +90,22 @@ value, or chrome url path as an alternate selector mitiages this bug.*/ --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#food"); } +[data-identity-icon="fruit"] { + --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#fruit"); +} + +[data-identity-icon="pet"] { + --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#pet"); +} + +[data-identity-icon="tree"] { + --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#tree"); +} + +[data-identity-icon="chill"] { + --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#chill"); +} + #userContext-indicator { height: 16px; width: 16px; diff --git a/data/usercontext.svg b/data/usercontext.svg index 0b53f91..761c2b2 100644 --- a/data/usercontext.svg +++ b/data/usercontext.svg @@ -53,5 +53,23 @@ + + + + diff --git a/index.js b/index.js index 779e484..87442e7 100644 --- a/index.js +++ b/index.js @@ -27,6 +27,10 @@ const IDENTITY_ICONS = [ { name: "gift", image: "gift" }, { name: "vacation", image: "vacation" }, { name: "food", image: "food" }, + { name: "fruit", image: "fruit" }, + { name: "pet", image: "pet" }, + { name: "tree", image: "tree" }, + { name: "chill", image: "chill" }, { name: "circle", image: "circle" }, // this doesn't exist in m-b ]; diff --git a/webextension/css/popup.css b/webextension/css/popup.css index 612738c..3b0498b 100644 --- a/webextension/css/popup.css +++ b/webextension/css/popup.css @@ -108,6 +108,22 @@ table { --identity-icon: url("/img/usercontext.svg#vacation"); } +[data-identity-icon="fruit"] { + --identity-icon: url("/img/usercontext.svg#fruit"); +} + +[data-identity-icon="pet"] { + --identity-icon: url("/img/usercontext.svg#pet"); +} + +[data-identity-icon="tree"] { + --identity-icon: url("/img/usercontext.svg#tree"); +} + +[data-identity-icon="chill"] { + --identity-icon: url("/img/usercontext.svg#chill"); +} + /* Buttons */ .button.primary { background-color: #0996f8; diff --git a/webextension/img/usercontext.svg b/webextension/img/usercontext.svg index 0b53f91..761c2b2 100644 --- a/webextension/img/usercontext.svg +++ b/webextension/img/usercontext.svg @@ -53,5 +53,23 @@ + + + + diff --git a/webextension/js/popup.js b/webextension/js/popup.js index 5264f71..b8f982c 100644 --- a/webextension/js/popup.js +++ b/webextension/js/popup.js @@ -494,7 +494,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, { return `