Merge pull request #811 from mozilla/bump-version-4.0.2

bump version to 4.0.2
fix #809 : use "Containers" for name for context menu
2017-09-13 22:32:54 +01:00 · 2017-09-13 16:16:43 -05:00 · 2017-09-13 10:07:56 -05:00 · 2017-09-07 14:28:47 -05:00 · 2017-09-07 12:03:28 -07:00 · 2017-09-07 10:12:25 -07:00
11 changed files with 65 additions and 26 deletions
@@ -3,6 +3,7 @@ docs/
 test/
 .npm/
 node_modules/
+bin/

 .env
 .eslintrc.js
@@ -14,6 +15,7 @@ node_modules/
 .stylelintrc
 .travis.yml
 *.xpi
+*.md
 .vimrc
 .DS_Store
 .gdb_history
@@ -1,4 +1,4 @@
-# Firefox Multi-Account Containers
+# Multi-Account Containers

 [![Available on Test Pilot](https://img.shields.io/badge/available_on-Test_Pilot-0996F8.svg)](https://testpilot.firefox.com/experiments/containers)

@@ -7,7 +7,7 @@
    <em:bootstrap>true</em:bootstrap>
    <em:multiprocessCompatible>true</em:multiprocessCompatible>
    <em:hasEmbeddedWebExtension>true</em:hasEmbeddedWebExtension>
-    <em:name>Firefox Multi-Account Containers</em:name>
+    <em:name>Multi-Account Containers</em:name>
    <em: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.</em:description>
    <em:targetApplication>
      <Description>
@@ -16,7 +16,7 @@
        <em:maxVersion>*</em:maxVersion>
      </Description>
    </em:targetApplication>
-    <em:version>4.0.0</em:version>
+    <em:version>4.0.2</em:version>
    <em:unpack>false</em:unpack>
  </Description>
 </RDF>
@@ -1,8 +1,8 @@
 {
  "name": "testpilot-containers",
-  "title": "Firefox Multi-Account 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": "4.0.0",
+  "version": "4.0.2",
  "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
  "bugs": {
    "url": "https://github.com/mozilla/testpilot-containers/issues"
@@ -1,7 +1,7 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Firefox Multi-Account Containers Confirm Navigation</title>
+  <title>Multi-Account Containers Confirm Navigation</title>
  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="chrome://browser/skin/aboutNetError.css" type="text/css" media="all" />
  <link rel="stylesheet" href="/css/confirm-page.css" />
 </head>
@@ -328,6 +328,13 @@ const assignManager = {
    });
  },

+  encodeURLProperty(url) {
+    return encodeURIComponent(url).replace(/[!'()*]/g, (c) => {
+      const charCode = c.charCodeAt(0).toString(16);
+      return `%${charCode}`;
+    });
+  },
+
  reloadPageInContainer(url, currentUserContextId, userContextId, index, neverAsk = false) {
    const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
    const loadPage = browser.extension.getURL("confirm-page.html");
@@ -336,7 +343,7 @@ const assignManager = {
    if (neverAsk) {
      browser.tabs.create({url, cookieStoreId, index});
    } else {
-      let confirmUrl = `${loadPage}?url=${encodeURIComponent(url)}&cookieStoreId=${cookieStoreId}`;
+      let confirmUrl = `${loadPage}?url=${this.encodeURLProperty(url)}&cookieStoreId=${cookieStoreId}`;
      let currentCookieStoreId;
      if (currentUserContextId) {
        currentCookieStoreId = backgroundLogic.cookieStoreId(currentUserContextId);
@@ -63,8 +63,7 @@ const backgroundLogic = {
      url = undefined;
    }

-    // We can't open these we just have to throw them away
-    if (new URL(url).protocol === "about:") {
+    if (!this.isPermissibleURL(url)) {
      return;
    }

@@ -76,6 +75,17 @@ const backgroundLogic = {
    });
  },

+  isPermissibleURL(url) {
+    const protocol = new URL(url).protocol;
+    // We can't open these we just have to throw them away
+    if (protocol === "about:"
+        || protocol === "chrome:"
+        || protocol === "moz-extension:") {
+      return false;
+    }
+    return true;
+  },
+
  checkArgs(requiredArguments, options, methodName) {
    requiredArguments.forEach((argument) => {
      if (!(argument in options)) {
@@ -118,20 +128,37 @@ const backgroundLogic = {
        containerState.hiddenTabs.length === 0) {
      return;
    }
-    const newWindowObj = await browser.windows.create({
-      tabId: list.shift().id
-    });
-    browser.tabs.move(list.map((tab) => tab.id), {
-      windowId: newWindowObj.id,
-      index: -1
-    });
+    let newWindowObj;
+    let hiddenDefaultTabToClose;
+    if (list.length) {
+      newWindowObj = await browser.windows.create({
+        tabId: list.shift().id
+      });
+      browser.tabs.move(list.map((tab) => tab.id), {
+        windowId: newWindowObj.id,
+        index: -1
+      });
+    } else {
+      //As we get a blank tab here we will need to await the tabs creation
+      newWindowObj = await browser.windows.create({
+      });
+      hiddenDefaultTabToClose = true;
+    }
+
+    const showHiddenPromises = [];

    // Let's show the hidden tabs.
    for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
-      browser.tabs.create(object.url || DEFAULT_TAB, {
+      showHiddenPromises.push(browser.tabs.create({
+        url: object.url || DEFAULT_TAB,
        windowId: newWindowObj.id,
        cookieStoreId
-      });
+      }));
+    }
+
+    if (hiddenDefaultTabToClose) {
+      // Lets wait for hidden tabs to show before closing the others
+      await showHiddenPromises;
    }

    containerState.hiddenTabs = [];
@@ -139,9 +166,9 @@ const backgroundLogic = {
    // Let's close all the normal tab in the new window. In theory it
    // should be only the first tab, but maybe there are addons doing
    // crazy stuff.
-    const tabs = browser.tabs.query({windowId: newWindowObj.id});
+    const tabs = await browser.tabs.query({windowId: newWindowObj.id});
    for (let tab of tabs) { // eslint-disable-line prefer-const
-      if (tabs.cookieStoreId !== cookieStoreId) {
+      if (tab.cookieStoreId !== cookieStoreId) {
        browser.tabs.remove(tab.id);
      }
    }
@@ -41,6 +41,9 @@ const identityState = {
    const tabsByContainer = await browser.tabs.query({cookieStoreId, windowId});
    tabsByContainer.forEach((tab) => {
      const tabObject = this._createTabObject(tab);
+      if (!backgroundLogic.isPermissibleURL(tab.url)) {
+        return;
+      }
      // This tab is going to be closed. Let's mark this tabObject as
      // non-active.
      tabObject.active = false;
@@ -39,7 +39,7 @@ const messageHandler = {
        backgroundLogic.sortTabs();
        break;
      case "showTabs":
-        backgroundLogic.showTabs({cookieStoreId: m.cookieStoreId});
+        this.unhideContainer(m.cookieStoreId);
        break;
      case "hideTabs":
        backgroundLogic.hideTabs({
@@ -1,9 +1,9 @@
 {
  "manifest_version": 2,
-  "name": "Firefox Multi-Account Containers",
-  "version": "4.0.0",
+  "name": "Multi-Account Containers",
+  "version": "4.0.2",

-  "description": "Firefox 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.",
+  "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"
@@ -45,7 +45,7 @@
  "browser_action": {
    "browser_style": true,
    "default_icon": "img/container-site.svg",
-    "default_title": "Firefox Multi-Account Containers",
+    "default_title": "Multi-Account Containers",
    "default_popup": "popup.html"
  },

@@ -1,7 +1,7 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Firefox Multi-Account Containers</title>
+  <title>Multi-Account Containers</title>
  <link rel="stylesheet" href="/css/popup.css">

 </head>
Author	SHA1	Message	Date
Jonathan Kingston	66e2c8e297	Merge pull request #811 from mozilla/bump-version-4.0.2 bump version to 4.0.2	2017-09-13 22:32:54 +01:00
groovecoder	80661d68f2	fix #809 : use "Containers" for name for context menu	2017-09-13 16:16:43 -05:00
groovecoder	ef8aa3be75	bump version to 4.0.2	2017-09-13 10:07:56 -05:00
luke crouch	6bc056e019	Merge pull request #794 from jonathanKingston/hide-button-in-queue Add show button to use showing queue to prevent dupes. Fixes #793	2017-09-07 14:28:47 -05:00
Jonathan Kingston	75deab139b	Fix a moving hidden tabs to a new window. Fixes #797	2017-09-07 12:03:28 -07:00
Jonathan Kingston	ae79f0a303	Ignore non permissible urls when hiding as we can't open them which causes issues. Fixes #793	2017-09-07 10:12:25 -07:00
Jonathan Kingston	9b83068234	Add show button to use showing queue to prevent dupes. Fixes #791	2017-09-07 09:25:13 -07:00
luke crouch	fec2be9429	Merge pull request #789 from jonathanKingston/encode-url-fix Encode non conforming chars that break moz-extension urls. Fixes #787	2017-09-07 09:05:16 -05:00
luke crouch	9f1b06ddd3	Merge pull request #790 from jonathanKingston/jpm-ignore-more Ignore more files with .jpmignore	2017-09-06 14:46:45 -05:00
Jonathan Kingston	ad2198e8b5	Encode non conforming chars that break moz-extension urls. Fixes #787	2017-09-05 17:10:07 -07:00
Jonathan Kingston	1791fdf0ef	Ignore more files with .jpmignore	2017-09-05 17:09:36 -07:00
luke crouch	4ab705081e	Merge pull request #788 from mozilla/bump-version-to-4.0.0 bump version to 4 for AMO	2017-09-05 14:25:57 -05:00
groovecoder	15b9dce1a9	AMO needs another version bump	2017-09-05 14:23:33 -05:00