diff --git a/package.json b/package.json index 172a4f5..b72d3d5 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ }, "dependencies": {}, "devDependencies": { - "ajv": "^6.6.2", "addons-linter": "^1.3.2", + "ajv": "^6.6.2", "chai": "^4.1.2", "eslint": "^3.17.1", "eslint-plugin-no-unsanitized": "^2.0.0", @@ -25,7 +25,7 @@ "stylelint": "^7.9.0", "stylelint-config-standard": "^16.0.0", "stylelint-order": "^0.3.0", - "web-ext": "^2.2.2" + "web-ext": "^2.9.3" }, "homepage": "https://github.com/mozilla/multi-account-containers#readme", "license": "MPL-2.0", diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js index dc9e991..d5aca77 100644 --- a/src/js/background/assignManager.js +++ b/src/js/background/assignManager.js @@ -4,7 +4,7 @@ const assignManager = { MENU_SEPARATOR_ID: "separator", MENU_HIDE_ID: "hide-container", MENU_MOVE_ID: "move-to-new-window-container", - + OPEN_IN_CONTAINER: "open-bookmark-in-container-tab", storageArea: { area: browser.storage.local, exemptedTabs: {}, @@ -143,7 +143,6 @@ const assignManager = { const userContextId = this.getUserContextIdFromCookieStore(tab); if (!siteSettings || userContextId === siteSettings.userContextId - || tab.incognito || this.storageArea.isExempted(options.url, tab.id)) { return {}; } @@ -221,7 +220,7 @@ const assignManager = { init() { browser.contextMenus.onClicked.addListener((info, tab) => { - this._onClickedHandler(info, tab); + info.bookmarkId ? this._onClickedBookmark(info) : this._onClickedHandler(info, tab); }); // Before a request is handled by the browser we decide if we should route through a different container @@ -241,7 +240,39 @@ const assignManager = { delete this.canceledRequests[options.tabId]; } },{urls: [""], types: ["main_frame"]}); + this.getPermissions(); + }, + async getPermissions() { + const {permissions} = await browser.permissions.getAll(); + permissions.includes("bookmarks") ? this.makeBookmarksMenu() : browser.contextMenus.remove(this.OPEN_IN_CONTAINER); + }, + + makeBookmarksMenu() { + this.initBookmarksMenu(); + browser.contextualIdentities.onCreated.addListener(this.contextualIdentityCreated); + browser.contextualIdentities.onUpdated.addListener(this.contextualIdentityUpdated); + browser.contextualIdentities.onRemoved.addListener(this.contextualIdentityRemoved); + }, + + contextualIdentityCreated(changeInfo) { + browser.contextMenus.create({ + parentId: assignManager.OPEN_IN_CONTAINER, + id: changeInfo.contextualIdentity.cookieStoreId, + title: changeInfo.contextualIdentity.name, + icons: { "16": `img/usercontext.svg#${changeInfo.contextualIdentity.icon}` } + }); + }, + + contextualIdentityUpdated(changeInfo) { + browser.contextMenus.update(changeInfo.contextualIdentity.cookieStoreId, { + title: changeInfo.contextualIdentity.name, + icons: { "16": `img/usercontext.svg#${changeInfo.contextualIdentity.icon}` } + }); + }, + + contextualIdentityRemoved(changeInfo) { + browser.contextMenus.remove(changeInfo.contextualIdentity.cookieStoreId); }, async _onClickedHandler(info, tab) { @@ -275,6 +306,38 @@ const assignManager = { } }, + async _onClickedBookmark(info) { + + async function _getBookmarksFromInfo(info) { + const [bookmarkTreeNode] = await browser.bookmarks.get(info.bookmarkId); + if (bookmarkTreeNode.type === "folder") { + return await browser.bookmarks.getChildren(bookmarkTreeNode.id); + } + return [bookmarkTreeNode]; + } + + const bookmarks = await _getBookmarksFromInfo(info); + for (const bookmark of bookmarks) { + // Some checks on the urls from https://github.com/Rob--W/bookmark-container-tab/ thanks! + if ( !/^(javascript|place):/i.test(bookmark.url) && bookmark.type !== "folder") { + const openInReaderMode = bookmark.url.startsWith("about:reader"); + if(openInReaderMode) { + try { + const parsed = new URL(bookmark.url); + bookmark.url = parsed.searchParams.get("url") + parsed.hash; // can't believe const lets me do this ... + } catch (err) { + return err.message; + } + } + browser.tabs.create({ + cookieStoreId: info.menuItemId, + url: bookmark.url, + openInReaderMode: openInReaderMode + }); + } + } + }, + deleteContainer(userContextId) { this.storageArea.deleteContainer(userContextId); @@ -289,11 +352,9 @@ const assignManager = { isTabPermittedAssign(tab) { // Ensure we are not an important about url - // Ensure we are not in incognito mode const url = new URL(tab.url); if (url.protocol === "about:" - || url.protocol === "moz-extension:" - || tab.incognito) { + || url.protocol === "moz-extension:") { return false; } return true; @@ -442,6 +503,24 @@ const assignManager = { throw e; }); } + }, + + async initBookmarksMenu() { + browser.contextMenus.create({ + id: this.OPEN_IN_CONTAINER, + title: "Open Bookmark in Container Tab", + contexts: ["bookmark"], + }); + + const identities = await browser.contextualIdentities.query({}); + for (const identity of identities) { + browser.contextMenus.create({ + parentId: this.OPEN_IN_CONTAINER, + id: identity.cookieStoreId, + title: identity.name, + icons: { "16": `img/usercontext.svg#${identity.icon}` } + }); + } } }; diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js index 52d61a2..96a1b26 100644 --- a/src/js/background/backgroundLogic.js +++ b/src/js/background/backgroundLogic.js @@ -46,15 +46,13 @@ const backgroundLogic = { donePromise = browser.contextualIdentities.create(options.params); } await donePromise; - browser.runtime.sendMessage({ - method: "refreshNeeded" - }); }, async openNewTab(options) { let url = options.url || undefined; const userContextId = ("userContextId" in options) ? options.userContextId : 0; const active = ("nofocus" in options) ? options.nofocus : true; + const discarded = ("noload" in options) ? options.noload : false; const cookieStoreId = backgroundLogic.cookieStoreId(userContextId); // Autofocus url bar will happen in 54: https://bugzilla.mozilla.org/show_bug.cgi?id=1295072 @@ -71,6 +69,7 @@ const backgroundLogic = { return browser.tabs.create({ url, active, + discarded, pinned: options.pinned || false, cookieStoreId }); @@ -313,6 +312,7 @@ const backgroundLogic = { userContextId: userContextId, url: object.url, nofocus: options.nofocus || false, + noload: true, pinned: object.pinned, })); } @@ -326,4 +326,4 @@ const backgroundLogic = { cookieStoreId(userContextId) { return `firefox-container-${userContextId}`; } -}; +}; \ No newline at end of file diff --git a/src/js/background/badge.js b/src/js/background/badge.js index 78cd9f1..7d532ac 100644 --- a/src/js/background/badge.js +++ b/src/js/background/badge.js @@ -2,22 +2,17 @@ const MAJOR_VERSIONS = ["2.3.0", "2.4.0"]; const badge = { async init() { const currentWindow = await browser.windows.getCurrent(); - this.displayBrowserActionBadge(currentWindow.incognito); - }, - - disableAddon(tabId) { - browser.browserAction.disable(tabId); - browser.browserAction.setTitle({ tabId, title: "Containers disabled in Private Browsing Mode" }); + this.displayBrowserActionBadge(currentWindow); }, async displayBrowserActionBadge() { const extensionInfo = await backgroundLogic.getExtensionInfo(); - const storage = await browser.storage.local.get({browserActionBadgesClicked: []}); + const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] }); if (MAJOR_VERSIONS.indexOf(extensionInfo.version) > -1 && - storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) { - browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"}); - browser.browserAction.setBadgeText({text: "NEW"}); + storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) { + browser.browserAction.setBadgeBackgroundColor({ color: "rgba(0,217,0,255)" }); + browser.browserAction.setBadgeText({ text: "NEW" }); } } }; diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js index 9fbe88e..132f0a7 100644 --- a/src/js/background/messageHandler.js +++ b/src/js/background/messageHandler.js @@ -10,6 +10,9 @@ const messageHandler = { let response; switch (m.method) { + case "resetBookmarksContext": + response = assignManager.getPermissions(); + break; case "deleteContainer": response = backgroundLogic.deleteContainer(m.message.userContextId); break; @@ -141,9 +144,6 @@ const messageHandler = { }, {urls: [""], types: ["main_frame"]}); browser.tabs.onCreated.addListener((tab) => { - if (tab.incognito) { - badge.disableAddon(tab.id); - } // lets remember the last tab created so we can close it if it looks like a redirect this.lastCreatedTab = tab; if (tab.cookieStoreId) { diff --git a/src/js/options.js b/src/js/options.js new file mode 100644 index 0000000..0eb1bb5 --- /dev/null +++ b/src/js/options.js @@ -0,0 +1,41 @@ + +function requestPermissions() { + const checkbox = document.querySelector("#bookmarksPermissions"); + if (checkbox.checked) { + browser.permissions.request({permissions: ["bookmarks"]}). + then((response) => { + if (response) { + browser.runtime.sendMessage({ method: "resetBookmarksContext" }); + } else { + checkbox.checked = false; + } + }). + catch((err) => { + return err.message; + }); + } else { + browser.permissions.remove({permissions: ["bookmarks"]}). + then(() => { + browser.runtime.sendMessage({ method: "resetBookmarksContext" }); + }). + catch((err) => { + return err.message; + }); + } +} + +function restoreOptions() { + browser.permissions.getAll() + .then((permissions) => { + if (permissions.permissions.includes("bookmarks")) { + document.querySelector("#bookmarksPermissions").checked = true; + } + }). + catch((err) => { + return err.message; + }); +} + + +document.addEventListener("DOMContentLoaded", restoreOptions); +document.querySelector("#bookmarksPermissions").addEventListener( "change", requestPermissions); \ No newline at end of file diff --git a/src/js/popup.js b/src/js/popup.js index ffee10a..433db3c 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -289,7 +289,13 @@ const Logic = { } } }); - document.querySelector(this.getPanelSelector(this._panels[panel])).classList.remove("hide"); + const panelEl = document.querySelector(this.getPanelSelector(this._panels[panel])); + panelEl.classList.remove("hide"); + + const focusEl = panelEl.querySelector(".firstTabindex"); + if(focusEl) { + focusEl.focus(); + } }, showPreviousPanel() { @@ -563,6 +569,22 @@ Logic.registerPanel(P_CONTAINERS_LIST, { } break; } + case 39: + { + const showTabs = element.parentNode.querySelector(".show-tabs"); + if(showTabs) { + showTabs.click(); + } + break; + } + case 37: + { + const hideTabs = document.querySelector(".panel-back-arrow"); + if(hideTabs) { + hideTabs.click(); + } + break; + } default: if ((e.keyCode >= 49 && e.keyCode <= 57) && Logic._currentPanel === "containersList") { @@ -648,7 +670,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, { tr.classList.add("container-panel-row"); - context.classList.add("userContext-wrapper", "open-newtab", "clickable"); + context.classList.add("userContext-wrapper", "open-newtab", "clickable", "firstTabindex"); manage.classList.add("show-tabs", "pop-button"); manage.setAttribute("title", `View ${identity.name} container`); context.setAttribute("tabindex", "0"); @@ -726,11 +748,15 @@ Logic.registerPanel(P_CONTAINER_INFO, { // This method is called when the object is registered. async initialize() { - Logic.addEnterHandler(document.querySelector("#close-container-info-panel"), () => { + const closeContEl = document.querySelector("#close-container-info-panel"); + closeContEl.setAttribute("tabindex", "0"); + closeContEl.classList.add("firstTabindex"); + Logic.addEnterHandler(closeContEl, () => { Logic.showPreviousPanel(); }); - - Logic.addEnterHandler(document.querySelector("#container-info-hideorshow"), async () => { + const hideContEl = document.querySelector("#container-info-hideorshow"); + hideContEl.setAttribute("tabindex", "0"); + Logic.addEnterHandler(hideContEl, async () => { const identity = Logic.currentIdentity(); try { browser.runtime.sendMessage({ @@ -754,6 +780,7 @@ Logic.registerPanel(P_CONTAINER_INFO, { throw new Error("Could not check for incompatible add-ons."); } const moveTabsEl = document.querySelector("#container-info-movetabs"); + moveTabsEl.setAttribute("tabindex","0"); const numTabs = await Logic.numTabs(); if (incompatible) { Logic._disableMoveTabs("Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs."); @@ -820,6 +847,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
${tab.title}
`; tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favIconUrl)); + tr.setAttribute("tabindex", "0"); document.getElementById("container-info-table").appendChild(fragment); // On click, we activate this tab. But only if this tab is active. diff --git a/src/manifest.json b/src/manifest.json index bab033b..285388d 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,22 +2,19 @@ "manifest_version": 2, "name": "Firefox Multi-Account Containers", "version": "6.1.1", - + "incognito": "not_allowed", "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": { "48": "img/container-site-d-48.png", "96": "img/container-site-d-96.png" }, - "applications": { "gecko": { "id": "@testpilot-containers", - "strict_min_version": "57.0" + "strict_min_version": "67.0" } }, - "homepage_url": "https://github.com/mozilla/multi-account-containers#readme", - "permissions": [ "", "activeTab", @@ -32,7 +29,9 @@ "webRequestBlocking", "webRequest" ], - + "optional_permissions": [ + "bookmarks" + ], "commands": { "_execute_browser_action": { "suggested_key": { @@ -42,33 +41,40 @@ "description": "Open containers panel" } }, - "browser_action": { "browser_style": true, "default_icon": "img/container-site.svg", "default_title": "Multi-Account Containers", "default_popup": "popup.html", - "theme_icons": [{ + "theme_icons": [ + { "light": "img/container-site-light.svg", "dark": "img/container-site.svg", "size": 32 - }] + } + ] }, - "background": { "page": "js/background/index.html" }, - "content_scripts": [ { - "matches": [""], - "js": ["js/content-script.js"], - "css": ["css/content.css"], + "matches": [ + "" + ], + "js": [ + "js/content-script.js" + ], + "css": [ + "css/content.css" + ], "run_at": "document_start" } ], - "web_accessible_resources": [ "/img/container-site-d-24.png" - ] -} + ], + "options_ui": { + "page": "options.html" + } +} \ No newline at end of file diff --git a/src/options.html b/src/options.html new file mode 100644 index 0000000..84f7353 --- /dev/null +++ b/src/options.html @@ -0,0 +1,16 @@ + + + + + + + + +
+ + +

This setting allows you to open a bookmark or folder of bookmarks in a container.

+
+ + + \ No newline at end of file diff --git a/test/browser.mock.js b/test/browser.mock.js index d6d38dd..fbff362 100644 --- a/test/browser.mock.js +++ b/test/browser.mock.js @@ -58,7 +58,16 @@ module.exports = () => { contextualIdentities: { create: sinon.stub(), get: sinon.stub(), - query: sinon.stub().resolves([]) + query: sinon.stub().resolves([]), + onCreated: { + addListener: sinon.stub() + }, + onUpdated: { + addListener: sinon.stub() + }, + onRemoved: { + addListener: sinon.stub() + } }, contextMenus: { create: sinon.stub(), @@ -82,6 +91,9 @@ module.exports = () => { }, extension: { getURL: sinon.stub().returns("moz-extension://multi-account-containers/confirm-page.html") + }, + permissions: { + getAll: sinon.stub().returns({"permissions": ["bookmarks"]}) } };