From dd57158ab50affd0926bdc545700651c1bfb416f Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Thu, 20 Sep 2018 21:34:19 +0530 Subject: [PATCH 01/19] #885 disables move tab to a new window when only one tab is opened --- src/js/popup.js | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index a9e3d26..141328c 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -212,6 +212,11 @@ const Logic = { return false; }, + async noOfTabs() { + const activeTabs = await browser.tabs.query({windowId: browser.windows.WINDOW_ID_CURRENT}); + return activeTabs.length; + }, + async refreshIdentities() { const [identities, state] = await Promise.all([ browser.contextualIdentities.query({}), @@ -717,13 +722,21 @@ Logic.registerPanel(P_CONTAINER_INFO, { moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling); } else { - Logic.addEnterHandler(moveTabsEl, async function () { - await browser.runtime.sendMessage({ - method: "moveTabsToWindow", - windowId: browser.windows.WINDOW_ID_CURRENT, - cookieStoreId: Logic.currentIdentity().cookieStoreId, - }); - window.close(); + Logic.noOfTabs().then(result => { + if (result === 1) { + moveTabsEl.classList.remove("clickable"); + } else { + Logic.addEnterHandler(moveTabsEl, async function () { + await browser.runtime.sendMessage({ + method: "moveTabsToWindow", + windowId: browser.windows.WINDOW_ID_CURRENT, + cookieStoreId: Logic.currentIdentity().cookieStoreId, + }); + window.close(); + }); + } + }).catch(error => { + throw new Error(error); }); } } catch (e) { From e57c556427fdb85aef5f7ef4a856e571b19e8f24 Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Thu, 20 Sep 2018 23:40:22 +0530 Subject: [PATCH 02/19] review changes --- src/js/popup.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index 141328c..42b00d3 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -212,7 +212,7 @@ const Logic = { return false; }, - async noOfTabs() { + async numTabs() { const activeTabs = await browser.tabs.query({windowId: browser.windows.WINDOW_ID_CURRENT}); return activeTabs.length; }, @@ -722,8 +722,9 @@ Logic.registerPanel(P_CONTAINER_INFO, { moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling); } else { - Logic.noOfTabs().then(result => { - if (result === 1) { + try { + const numTabs = await Logic.numTabs(); + if (numTabs === 1) { moveTabsEl.classList.remove("clickable"); } else { Logic.addEnterHandler(moveTabsEl, async function () { @@ -735,9 +736,9 @@ Logic.registerPanel(P_CONTAINER_INFO, { window.close(); }); } - }).catch(error => { - throw new Error(error); - }); + } catch (e) { + throw new Error("Could not get the number of active tabs."); + } } } catch (e) { throw new Error("Could not check for incompatible add-ons."); From 7f7f221a79acbe731e232e9fdfcb1962e9d3e56c Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Fri, 21 Sep 2018 14:00:20 +0530 Subject: [PATCH 03/19] fix-#1028 resolves focus name field on opening new container sub-panel --- src/js/popup.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/js/popup.js b/src/js/popup.js index a9e3d26..419377e 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1001,6 +1001,12 @@ Logic.registerPanel(P_CONTAINER_EDIT, { document.querySelector("#edit-container-panel-name-input").value = identity.name || ""; document.querySelector("#edit-container-panel-usercontext-input").value = userContextId || NEW_CONTAINER_ID; + const containerName = document.querySelector("#edit-container-panel-name-input"); + setTimeout(function() + { + containerName.focus(); + containerName.select(); + }, 0); [...document.querySelectorAll("[name='container-color']")].forEach(colorInput => { colorInput.checked = colorInput.value === identity.color; }); @@ -1015,7 +1021,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, { // P_CONTAINER_DELETE: Delete a container. // ---------------------------------------------------------------------------- - Logic.registerPanel(P_CONTAINER_DELETE, { panelSelector: "#delete-container-panel", From e1c1ac4bd9a7a1394153e3e8866c273acce778ed Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Fri, 21 Sep 2018 14:31:54 +0530 Subject: [PATCH 04/19] adds back the unnecessarily removed new line --- src/js/popup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/popup.js b/src/js/popup.js index 419377e..0226ddd 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1021,6 +1021,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, { // P_CONTAINER_DELETE: Delete a container. // ---------------------------------------------------------------------------- + Logic.registerPanel(P_CONTAINER_DELETE, { panelSelector: "#delete-container-panel", From fe0810b048464888208bc51a38de6e63dc28fc52 Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Sun, 23 Sep 2018 00:42:43 +0530 Subject: [PATCH 05/19] restructuring the code acc to the review --- src/js/popup.js | 69 +++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index 42b00d3..2964f02 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -217,6 +217,22 @@ const Logic = { return activeTabs.length; }, + _disableMoveTabs(message) { + const moveTabsEl = document.querySelector("#container-info-movetabs"); + const fragment = document.createDocumentFragment(); + const incompatEl = document.createElement("div"); + + moveTabsEl.classList.remove("clickable"); + moveTabsEl.setAttribute("title", message); + + fragment.appendChild(incompatEl); + incompatEl.setAttribute("id", "container-info-movetabs-incompat"); + incompatEl.textContent = message; + incompatEl.classList.add("container-info-tab-row"); + + moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling); + }, + async refreshIdentities() { const [identities, state] = await Promise.all([ browser.contextualIdentities.query({}), @@ -703,46 +719,31 @@ Logic.registerPanel(P_CONTAINER_INFO, { }); // Check if the user has incompatible add-ons installed + let incompatible = false; try { - const incompatible = await browser.runtime.sendMessage({ + incompatible = await browser.runtime.sendMessage({ method: "checkIncompatibleAddons" }); - const moveTabsEl = document.querySelector("#container-info-movetabs"); - if (incompatible) { - const fragment = document.createDocumentFragment(); - const incompatEl = document.createElement("div"); - - moveTabsEl.classList.remove("clickable"); - moveTabsEl.setAttribute("title", "Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs."); - - fragment.appendChild(incompatEl); - incompatEl.setAttribute("id", "container-info-movetabs-incompat"); - incompatEl.textContent = "Incompatible with other Experiments."; - incompatEl.classList.add("container-info-tab-row"); - - moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling); - } else { - try { - const numTabs = await Logic.numTabs(); - if (numTabs === 1) { - moveTabsEl.classList.remove("clickable"); - } else { - Logic.addEnterHandler(moveTabsEl, async function () { - await browser.runtime.sendMessage({ - method: "moveTabsToWindow", - windowId: browser.windows.WINDOW_ID_CURRENT, - cookieStoreId: Logic.currentIdentity().cookieStoreId, - }); - window.close(); - }); - } - } catch (e) { - throw new Error("Could not get the number of active tabs."); - } - } } catch (e) { throw new Error("Could not check for incompatible add-ons."); } + const moveTabsEl = document.querySelector("#container-info-movetabs"); + const numTabs = await Logic.numTabs(); + if (incompatible) { + Logic._disableMoveTabs("Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs."); + return; + } else if (numTabs === 1) { + Logic._disableMoveTabs("Cannot move a tab from a single-tab window."); + return; + } + Logic.addEnterHandler(moveTabsEl, async function () { + await browser.runtime.sendMessage({ + method: "moveTabsToWindow", + windowId: browser.windows.WINDOW_ID_CURRENT, + cookieStoreId: Logic.currentIdentity().cookieStoreId, + }); + window.close(); + }); }, // This method is called when the panel is shown. From aada0419eb2fb75f5d7856e3787843f7e35ea845 Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Sun, 30 Sep 2018 18:17:01 +0530 Subject: [PATCH 06/19] removing event loop and using requestAnimationFrame --- src/js/popup.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index 0226ddd..c3503b6 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1002,11 +1002,10 @@ Logic.registerPanel(P_CONTAINER_EDIT, { document.querySelector("#edit-container-panel-name-input").value = identity.name || ""; document.querySelector("#edit-container-panel-usercontext-input").value = userContextId || NEW_CONTAINER_ID; const containerName = document.querySelector("#edit-container-panel-name-input"); - setTimeout(function() - { - containerName.focus(); - containerName.select(); - }, 0); + window.requestAnimationFrame(() => { + containerName.select(); + containerName.focus(); + }); [...document.querySelectorAll("[name='container-color']")].forEach(colorInput => { colorInput.checked = colorInput.value === identity.color; }); From d7586dd4c26f5d96699eee80468f68f997ec53ce Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Fri, 28 Sep 2018 03:48:46 +0530 Subject: [PATCH 07/19] resolves #256 disables edit-container button when no container is present resolve lint errors review changes --- src/css/popup.css | 6 ++++++ src/js/popup.js | 7 +++++++ src/popup.html | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/css/popup.css b/src/css/popup.css index af78306..6eb6496 100644 --- a/src/css/popup.css +++ b/src/css/popup.css @@ -45,6 +45,7 @@ body { --small-text-size: 0.833rem; /* 10px */ --small-radius: 3px; --icon-button-size: calc(calc(var(--block-line-separation-size) * 2) + 1.66rem); /* 20px */ + --inactive-opacity: 0.3; } @media (min-resolution: 1dppx) { @@ -578,6 +579,11 @@ span ~ .panel-header-text { max-inline-size: 204px; } +.disable-edit-containers { + opacity: var(--inactive-opacity); + pointer-events: none; +} + .userContext-wrapper { align-items: center; display: flex; diff --git a/src/js/popup.js b/src/js/popup.js index 2964f02..649384a 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -687,6 +687,13 @@ Logic.registerPanel(P_CONTAINERS_LIST, { document.addEventListener("mousedown", () => { document.removeEventListener("focus", focusHandler); }); + /* If no container is present disable the Edit Containers button */ + const editContainer = document.querySelector("#edit-containers"); + if (Logic.identities().length === 0) { + editContainer.classList.add("disable-edit-containers"); + } else { + editContainer.classList.remove("disable-edit-containers"); + } return Promise.resolve(); }, diff --git a/src/popup.html b/src/popup.html index a28dd32..c342edd 100644 --- a/src/popup.html +++ b/src/popup.html @@ -116,7 +116,7 @@
-
+
Edit Containers
From 6c62c2f5995a1b468d0666fc92e16bb348b3f71c Mon Sep 17 00:00:00 2001 From: hritvi Date: Mon, 24 Sep 2018 02:16:40 +0530 Subject: [PATCH 08/19] fixes vulnerabilities in npm --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 746a84f..5389e3b 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,16 @@ "bugs": { "url": "https://github.com/mozilla/multi-account-containers/issues" }, - "dependencies": {}, + "dependencies": { + "hoek": "^5.0.4" + }, "devDependencies": { - "addons-linter": "^0.15.14", + "addons-linter": "^1.3.2", "chai": "^4.1.2", - "deploy-txp": "^1.0.7", "eslint": "^3.17.1", "eslint-plugin-no-unsanitized": "^2.0.0", "eslint-plugin-promise": "^3.4.0", - "htmllint-cli": "^0.0.5", + "htmllint-cli": "0.0.7", "jsdom": "^11.6.2", "json": "^9.0.6", "mocha": "^5.0.0", @@ -36,7 +37,6 @@ }, "scripts": { "build": "npm test && cd src && web-ext build --overwrite-dest", - "deploy": "deploy-txp", "lint": "npm-run-all lint:*", "lint:addon": "addons-linter src --self-hosted", "lint:css": "stylelint src/css/*.css", From 0e7363a87ffd50316a8daf55ac307d7f711f3b2a Mon Sep 17 00:00:00 2001 From: hritvi Date: Wed, 3 Oct 2018 16:16:32 +0530 Subject: [PATCH 09/19] npm fixes --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 5389e3b..7b52d8b 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,7 @@ "bugs": { "url": "https://github.com/mozilla/multi-account-containers/issues" }, - "dependencies": { - "hoek": "^5.0.4" - }, + "dependencies": {}, "devDependencies": { "addons-linter": "^1.3.2", "chai": "^4.1.2", From 752d18ffca5aecba16edbd3771db36396f913c0c Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Thu, 18 Oct 2018 21:33:48 +0530 Subject: [PATCH 10/19] prevent event handler when edit containers disabled --- src/js/popup.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/popup.js b/src/js/popup.js index 649384a..0c1fe11 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -507,7 +507,9 @@ Logic.registerPanel(P_CONTAINERS_LIST, { }); Logic.addEnterHandler(document.querySelector("#edit-containers-link"), () => { - Logic.showPanel(P_CONTAINERS_EDIT); + if (!document.querySelector("#edit-containers").classList.contains("disable-edit-containers")){ + Logic.showPanel(P_CONTAINERS_EDIT); + } }); Logic.addEnterHandler(document.querySelector("#sort-containers-link"), async function () { From dcc3b76cdab9118ed3f3a629a66c75793aa14484 Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Sun, 21 Oct 2018 17:12:56 +0530 Subject: [PATCH 11/19] simplifying the solution --- src/js/popup.js | 6 +++--- src/popup.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index 0c1fe11..f9b5efb 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -506,8 +506,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, { Logic.showPanel(P_CONTAINER_EDIT, { name: Logic.generateIdentityName() }); }); - Logic.addEnterHandler(document.querySelector("#edit-containers-link"), () => { - if (!document.querySelector("#edit-containers").classList.contains("disable-edit-containers")){ + Logic.addEnterHandler(document.querySelector("#edit-containers-link"), (e) => { + if (!e.target.classList.contains("disable-edit-containers")){ Logic.showPanel(P_CONTAINERS_EDIT); } }); @@ -690,7 +690,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, { document.removeEventListener("focus", focusHandler); }); /* If no container is present disable the Edit Containers button */ - const editContainer = document.querySelector("#edit-containers"); + const editContainer = document.querySelector("#edit-containers-link"); if (Logic.identities().length === 0) { editContainer.classList.add("disable-edit-containers"); } else { diff --git a/src/popup.html b/src/popup.html index c342edd..a28dd32 100644 --- a/src/popup.html +++ b/src/popup.html @@ -116,7 +116,7 @@
-
+
Edit Containers
From 56fc7407da082627aa0b6b94adff9c8407833046 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Sun, 21 Oct 2018 21:13:57 +0100 Subject: [PATCH 12/19] Add in missing favicon. Fixes #1285 --- src/img/blank-favicon.svg | 8 ++++++++ src/js/utils.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/img/blank-favicon.svg diff --git a/src/img/blank-favicon.svg b/src/img/blank-favicon.svg new file mode 100644 index 0000000..c2393b6 --- /dev/null +++ b/src/img/blank-favicon.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/src/js/utils.js b/src/js/utils.js index 5d5046b..804e9d9 100644 --- a/src/js/utils.js +++ b/src/js/utils.js @@ -1,4 +1,4 @@ -const DEFAULT_FAVICON = "moz-icon://goat?size=16"; +const DEFAULT_FAVICON = "/img/blank-favicon.svg"; // TODO use export here instead of globals window.Utils = { From 5813621fb955860a02c435e2aeaee6d59c463060 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Sun, 21 Oct 2018 21:25:55 +0100 Subject: [PATCH 13/19] Remove badge background error. Fixes #1293 --- src/js/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/popup.js b/src/js/popup.js index 870b9a4..18eec68 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -162,7 +162,7 @@ const Logic = { async clearBrowserActionBadge() { const extensionInfo = await getExtensionInfo(); const storage = await browser.storage.local.get({browserActionBadgesClicked: []}); - browser.browserAction.setBadgeBackgroundColor({color: ""}); + browser.browserAction.setBadgeBackgroundColor({color: null}); browser.browserAction.setBadgeText({text: ""}); storage.browserActionBadgesClicked.push(extensionInfo.version); // use set and spread to create a unique array From f7f4c320a6f4868eb123414644ebacf86f69488c Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Sun, 21 Oct 2018 22:22:48 +0100 Subject: [PATCH 14/19] Fix missing assignment check mark. Fixes #1271 --- src/css/popup.css | 2 +- src/img/check.svg | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/img/check.svg diff --git a/src/css/popup.css b/src/css/popup.css index 6eb6496..6f9e64a 100644 --- a/src/css/popup.css +++ b/src/css/popup.css @@ -538,7 +538,7 @@ span ~ .panel-header-text { } #current-tab > label > input:checked { - background-image: url("chrome://global/skin/in-content/check.svg#check-native"); + background-image: url("/img/check.svg"); background-position: -1px -1px; background-size: var(--icon-size); } diff --git a/src/img/check.svg b/src/img/check.svg new file mode 100644 index 0000000..bcbcfc0 --- /dev/null +++ b/src/img/check.svg @@ -0,0 +1,6 @@ + + + + From 0a437ff303fe50caeb6c97267333674cdbb434d5 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Sun, 21 Oct 2018 22:32:21 +0100 Subject: [PATCH 15/19] Bump release to 6.0.1. Fixes #1296 --- package.json | 2 +- src/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7b52d8b..8c2d546 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "testpilot-containers", "title": "Multi-Account Containers", "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.", - "version": "6.0.0", + "version": "6.0.1", "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston", "bugs": { "url": "https://github.com/mozilla/multi-account-containers/issues" diff --git a/src/manifest.json b/src/manifest.json index f3fa049..d624d32 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Firefox Multi-Account Containers", - "version": "6.0.0", + "version": "6.0.1", "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.", "icons": { From b6dd32f6836b5d0b61cc9286c7f4dc329f2f04e0 Mon Sep 17 00:00:00 2001 From: aabbi Date: Mon, 22 Oct 2018 20:05:03 -0400 Subject: [PATCH 16/19] moved unhiding container to background logic --- src/js/background/backgroundLogic.js | 33 +++++++++++++++++++++------- src/js/background/messageHandler.js | 16 ++------------ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js index 04906d8..124631d 100644 --- a/src/js/background/backgroundLogic.js +++ b/src/js/background/backgroundLogic.js @@ -6,6 +6,7 @@ const backgroundLogic = { "about:home", "about:blank" ]), + unhideQueue: [], async getExtensionInfo() { const manifestPath = browser.extension.getURL("manifest.json"); @@ -112,6 +113,17 @@ const backgroundLogic = { return list.concat(containerState.hiddenTabs); }, + async unhideContainer(cookieStoreId) { + if (!this.unhideQueue.includes(cookieStoreId)) { + this.unhideQueue.push(cookieStoreId); + await this.showTabs({ + cookieStoreId + }); + this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1); + } + }, + + async moveTabsToWindow(options) { const requiredArguments = ["cookieStoreId", "windowId"]; this.checkArgs(requiredArguments, options, "moveTabsToWindow"); @@ -123,6 +135,7 @@ const backgroundLogic = { }); const containerState = await identityState.storageArea.get(cookieStoreId); + // Nothing to do if (list.length === 0 && containerState.hiddenTabs.length === 0) { @@ -152,12 +165,15 @@ const backgroundLogic = { const showHiddenPromises = []; // Let's show the hidden tabs. - for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const - showHiddenPromises.push(browser.tabs.create({ - url: object.url || DEFAULT_TAB, - windowId: newWindowObj.id, - cookieStoreId - })); + if (!this.unhideQueue.includes(cookieStoreId)) { + this.unhideQueue.push(cookieStoreId); + for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const + showHiddenPromises.push(browser.tabs.create({ + url: object.url || DEFAULT_TAB, + windowId: newWindowObj.id, + cookieStoreId + })); + } } if (hiddenDefaultTabToClose) { @@ -176,7 +192,9 @@ const backgroundLogic = { browser.tabs.remove(tab.id); } } - return await identityState.storageArea.set(cookieStoreId, containerState); + const rv = await identityState.storageArea.set(cookieStoreId, containerState); + this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1); + return rv; }, async _closeTabs(userContextId, windowId = false) { @@ -307,4 +325,3 @@ const backgroundLogic = { return `firefox-container-${userContextId}`; } }; - diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js index 6e5fced..9fbe88e 100644 --- a/src/js/background/messageHandler.js +++ b/src/js/background/messageHandler.js @@ -3,7 +3,6 @@ const messageHandler = { // We use this to catch redirected tabs that have just opened // If this were in platform we would change how the tab opens based on "new tab" link navigations such as ctrl+click LAST_CREATED_TAB_TIMER: 2000, - unhideQueue: [], init() { // Handles messages from webextension code @@ -39,7 +38,7 @@ const messageHandler = { backgroundLogic.sortTabs(); break; case "showTabs": - this.unhideContainer(m.cookieStoreId); + backgroundLogic.unhideContainer(m.cookieStoreId); break; case "hideTabs": backgroundLogic.hideTabs({ @@ -156,7 +155,7 @@ const messageHandler = { this.incrementCountOfContainerTabsOpened(); } - this.unhideContainer(tab.cookieStoreId); + backgroundLogic.unhideContainer(tab.cookieStoreId); } setTimeout(() => { this.lastCreatedTab = null; @@ -182,17 +181,6 @@ const messageHandler = { } }, - async unhideContainer(cookieStoreId) { - if (!this.unhideQueue.includes(cookieStoreId)) { - this.unhideQueue.push(cookieStoreId); - // Unhide all hidden tabs - await backgroundLogic.showTabs({ - cookieStoreId - }); - this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1); - } - }, - async onFocusChangedCallback(windowId) { assignManager.removeContextMenu(); // browserAction loses background color in new windows ... From 66a9116524620e97d0879fafe8c78b8f0807738a Mon Sep 17 00:00:00 2001 From: mingchia-andy-liu Date: Sun, 29 Apr 2018 14:40:42 +0800 Subject: [PATCH 17/19] Fix delete warning message #1051 - Include the number of tabs that will be closed when container is deleted - Insert the warning message to the `span` tag that was originally there --- src/js/background/backgroundLogic.js | 4 +++- src/js/popup.js | 19 +++++++++++++++++-- src/popup.html | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js index 124631d..89f9159 100644 --- a/src/js/background/backgroundLogic.js +++ b/src/js/background/backgroundLogic.js @@ -227,7 +227,9 @@ const backgroundLogic = { }); identitiesOutput[cookieStoreId] = { hasHiddenTabs: !!containerState.hiddenTabs.length, - hasOpenTabs: !!openTabs.length + hasOpenTabs: !!openTabs.length, + numberOfHiddenTabs: containerState.hiddenTabs.length, + numberOfOpenTabs: openTabs.length }; return; }); diff --git a/src/js/popup.js b/src/js/popup.js index 18eec68..e0db6fe 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -177,7 +177,9 @@ const Logic = { name: "Default", cookieStoreId, icon: "default-tab", - color: "default-tab" + color: "default-tab", + numberOfHiddenTabs: 0, + numberOfOpenTabs: 0 }; // Handle old style rejection with null and also Promise.reject new style try { @@ -248,6 +250,8 @@ const Logic = { if (stateObject) { identity.hasOpenTabs = stateObject.hasOpenTabs; identity.hasHiddenTabs = stateObject.hasHiddenTabs; + identity.numberOfHiddenTabs = stateObject.numberOfHiddenTabs; + identity.numberOfOpenTabs = stateObject.numberOfOpenTabs; } return identity; }); @@ -1074,9 +1078,20 @@ Logic.registerPanel(P_CONTAINER_DELETE, { prepare() { const identity = Logic.currentIdentity(); - // Populating the panel: name and icon + // Populating the panel: name, icon, and warning message document.getElementById("delete-container-name").textContent = identity.name; + const totalNumberOfTabs = identity.numberOfHiddenTabs + identity.numberOfOpenTabs; + if (totalNumberOfTabs > 0) { + let warningMessage = `If you remove this container now, ${totalNumberOfTabs} `; + warningMessage += totalNumberOfTabs > 1 + ? "container tabs will be closed." + : "container tab will be closed."; + document.getElementById("delete-container-tab-warning").textContent = warningMessage; + } else { + document.getElementById("delete-container-tab-warning").textContent = ""; + } + const icon = document.getElementById("delete-container-icon"); icon.setAttribute("data-identity-icon", identity.icon); icon.setAttribute("data-identity-color", identity.color); diff --git a/src/popup.html b/src/popup.html index a28dd32..4cd8219 100644 --- a/src/popup.html +++ b/src/popup.html @@ -204,7 +204,7 @@

Remove This Container

-

If you remove this container now, container tabs will be closed. Are you sure you want to remove this Container?

+

Are you sure you want to remove this Container?

Cancel From 4ed453d58e729db1fd9b749e8d892a6ed7ccdd3f Mon Sep 17 00:00:00 2001 From: groovecoder Date: Fri, 28 Dec 2018 14:29:09 -0600 Subject: [PATCH 18/19] save ajv at 6.6.2 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 8c2d546..b57cc35 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "dependencies": {}, "devDependencies": { + "ajv": "^6.6.2", "addons-linter": "^1.3.2", "chai": "^4.1.2", "eslint": "^3.17.1", From 5b58168999af68871ad267827a5e3fef7f1e7997 Mon Sep 17 00:00:00 2001 From: shivangikakkar Date: Tue, 1 Jan 2019 03:12:10 +0900 Subject: [PATCH 19/19] Refactored the logic to form warning message --- src/js/popup.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index e0db6fe..9005ff3 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1082,15 +1082,12 @@ Logic.registerPanel(P_CONTAINER_DELETE, { document.getElementById("delete-container-name").textContent = identity.name; const totalNumberOfTabs = identity.numberOfHiddenTabs + identity.numberOfOpenTabs; + let warningMessage = ""; if (totalNumberOfTabs > 0) { - let warningMessage = `If you remove this container now, ${totalNumberOfTabs} `; - warningMessage += totalNumberOfTabs > 1 - ? "container tabs will be closed." - : "container tab will be closed."; - document.getElementById("delete-container-tab-warning").textContent = warningMessage; - } else { - document.getElementById("delete-container-tab-warning").textContent = ""; + const grammaticalNumTabs = totalNumberOfTabs > 1 ? "tabs" : "tab"; + warningMessage = `If you remove this container now, ${totalNumberOfTabs} container ${grammaticalNumTabs} will be closed.`; } + document.getElementById("delete-container-tab-warning").textContent = warningMessage; const icon = document.getElementById("delete-container-icon"); icon.setAttribute("data-identity-icon", identity.icon);