From 412aba0c8bb5f802dfb9cafa40aefc1e2ca0409e Mon Sep 17 00:00:00 2001 From: Undoundoundo <39829775+Undoundoundo@users.noreply.github.com> Date: Fri, 1 May 2020 13:33:45 -0400 Subject: [PATCH 1/6] Update CONTRIBUTING.md replaced reference to IRC with reference to Matrix chat --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09b7e86..8121f8d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Everyone is welcome to contribute to containers. Reach out to team members if you have questions: -- IRC: #containers on irc.mozilla.org +- Matrix chat: #containers:mozilla.org - Email: containers@mozilla.com ## Filing bugs From 642553a3418a69cffee7519289bcaa0a554739de Mon Sep 17 00:00:00 2001 From: Nathan Hinchey Date: Thu, 28 May 2020 12:22:29 -0400 Subject: [PATCH 2/6] Remove unused `data` directory --- data/filters.svg | 9 --- data/usercontext.css | 143 ------------------------------------------- data/usercontext.svg | 72 ---------------------- 3 files changed, 224 deletions(-) delete mode 100644 data/filters.svg delete mode 100644 data/usercontext.css delete mode 100644 data/usercontext.svg diff --git a/data/filters.svg b/data/filters.svg deleted file mode 100644 index 6119d59..0000000 --- a/data/filters.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/data/usercontext.css b/data/usercontext.css deleted file mode 100644 index 0f36d19..0000000 --- a/data/usercontext.css +++ /dev/null @@ -1,143 +0,0 @@ -#userContext-indicator { - height: 16px; - list-style-image: none !important; - vertical-align: middle; - width: 16px; -} - -#userContext-label { - color: var(--identity-tab-color) !important; - margin-inline-end: 5px; - max-inline-size: 75px; - text-overflow: ellipsis; - white-space: nowrap; -} - -#userContext-icons { - -moz-box-align: center; - align-items: center; - display: flex; - max-inline-size: 120px; -} - -#userContext-icons[data-identity-color=""] { - display: none; -} - -/* containers experiment */ - -/* reset nightly containers */ -.tabbrowser-tab[usercontextid] { - background-image: none !important; - background-repeat: no-repeat; - background-size: 0; -} - -/* special styles run through a psuedo-class off of -these elements so they need to be relatively positioned. -these styles address both regular and compact themes, -special cases are addressed below */ -.tabbrowser-tab[usercontextid] .tab-background-middle, -#main-window[style*='compact'] .tabbrowser-tab[usercontextid] .tab-content, -#verticaltabs-box .tabbrowser-tab[usercontextid] .tab-content { - position: relative; -} - -.tabbrowser-tab[usercontextid] .tab-background-middle::after, -#main-window[style*='compact'] .tabbrowser-tab[usercontextid] .tab-content::after { - background-color: var(--identity-tab-color); - bottom: 0; - content: ''; - height: 2px; - left: 0; - position: absolute; - right: 0; - width: 100%; - z-index: 999; -} - -.tabbrowser-tab[usercontextid] .tab-background-middle::after { - background-color: var(--identity-tab-color); - border-radius: 2px 2px 0 0; - bottom: 1px; - height: 3px; -} - -.tabbrowser-tab[usercontextid]:not([visuallyselected="true"]) .tab-background-middle::after { - bottom: 2px; - height: 2px !important; -} - -.tabbrowser-tab[usercontextid][pinned="true"] .tab-background-middle::after { - left: -150%; - width: 400%; -} - -.tabs-newtab-button .toolbarbutton-icon[type="menu"] { - margin-inline-end: 0; -} - -.tabs-newtab-button .toolbarbutton-menu-dropmarker { - display: none; -} - -#new-tab-overlay { - --icon-size: 16px; - -moz-appearance: none; - background: transparent; - font-style: -moz-use-system-font; - inline-size: 180px; - margin-inline-start: -50px !important; - visibility: visible; -} - -#new-tab-overlay .panel-arrowcontent { - -moz-appearance: none !important; - background: none; - border: 0; - box-shadow: none; - display: block; - margin-block-end: 0; - margin-block-start: 2px; - padding-block-start: 0 !important; -} - -#new-tab-overlay .panel-arrowcontent, -#new-tab-overlay menuitem { - inline-size: 100%; -} - -#new-tab-overlay .panel-arrowbox { - display: none; -} - -#new-tab-overlay[hidden=true] { - display: none; -} - -#new-tab-overlay menuitem { - -moz-appearance: none; - background: white; - border-radius: 20px; - border: 0; - box-shadow: 0 0 7px #0004; - color: #4b4b4b; - margin-block-end: 5px; - padding-block-end: 10px; - padding-block-start: 10px; - padding-inline-end: 10px; - padding-inline-start: 10px; -} - -#new-tab-overlay menuitem:hover { - background: #f2f2f2; -} - -#new-tab-overlay .menuitem-iconic[data-usercontextid] > .menu-iconic-left > .menu-iconic-icon { - block-size: var(--icon-size); - inline-size: var(--icon-size); -} - -.menuitem-iconic[data-usercontextid] > .menu-iconic-left { - visibility: visible; -} diff --git a/data/usercontext.svg b/data/usercontext.svg deleted file mode 100644 index f58067a..0000000 --- a/data/usercontext.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - From f4a087d0eddfe2b71f488971e87e52e0629fafbb Mon Sep 17 00:00:00 2001 From: Kafji Date: Sun, 31 May 2020 10:46:24 +0700 Subject: [PATCH 3/6] Fix sync resource hog Hypothesis: On receiving onChanged event of browser.storage.sync, sync will try to _merge_ the container data and backup the merged data. One of the merging process is called reconcileSiteAssignments in which sync will remove assigned site form the delete site list. On each removal sync will tell assignManager, the one who hold container data locally, to remove it as well. In turn the assignManager will remove *and then* tell sync to backup the data. This causes the backup process in sync to be invoked multiple times, one from the sync process and one for each of removed assigned site list. To make matters worse, the backup from removal of assigned site list will run in parallel from each others. This might fixes #1691. --- src/js/background/assignManager.js | 4 ++-- src/js/background/sync.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js index deee22a..a328610 100644 --- a/src/js/background/assignManager.js +++ b/src/js/background/assignManager.js @@ -84,13 +84,13 @@ window.assignManager = { return; }, - async remove(pageUrlorUrlKey) { + async remove(pageUrlorUrlKey, shouldSync = true) { const siteStoreKey = this.getSiteStoreKey(pageUrlorUrlKey); // When we remove an assignment we should clear all the exemptions this.removeExempted(pageUrlorUrlKey); await this.area.remove([siteStoreKey]); const syncEnabled = await this.getSyncEnabled(); - if (syncEnabled) await sync.storageArea.backup({siteStoreKey}); + if (shouldSync && syncEnabled) await sync.storageArea.backup({siteStoreKey}); return; }, diff --git a/src/js/background/sync.js b/src/js/background/sync.js index b34ea00..6dfb629 100644 --- a/src/js/background/sync.js +++ b/src/js/background/sync.js @@ -493,9 +493,9 @@ async function reconcileSiteAssignments() { await sync.storageArea.getDeletedSiteList(); for(const siteStoreKey of deletedSiteList) { if (Object.prototype.hasOwnProperty.call(assignedSitesLocal,siteStoreKey)) { - assignManager + await assignManager .storageArea - .remove(siteStoreKey); + .remove(siteStoreKey, false); } } From 3247f3dc7d803dbb7138dc93df2f6897324a89a2 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Thu, 15 Oct 2020 22:52:34 +0100 Subject: [PATCH 4/6] Bottom button shouldn't obstruct the list Having .bottom-btn { position: fixed; } cause the button to obstruct the last few items in the list. --- src/css/popup.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/css/popup.css b/src/css/popup.css index 543936e..f50c0b7 100644 --- a/src/css/popup.css +++ b/src/css/popup.css @@ -102,7 +102,8 @@ table { flex: 1; inline-size: 100%; max-block-size: 400px; - overflow: auto; + overflow-x: hidden; + overflow-y: auto; } .offpage { @@ -814,11 +815,11 @@ hr { inline-size: 100%; inset-block-end: 0; line-height: 41px; + overflow: hidden; padding-block-end: 0; padding-block-start: 0; padding-inline-end: 16px; padding-inline-start: 16px; - position: fixed; } .delete-container { From 21622c9490a73bf47d0cf16feb19791599720d6a Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Mon, 25 Oct 2021 16:30:03 +0200 Subject: [PATCH 5/6] Update a json dev-dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26d2e1a..9e767a4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "eslint-plugin-no-unsanitized": "^2.0.0", "eslint-plugin-promise": "^3.4.0", "htmllint-cli": "0.0.7", - "json": "^9.0.6", + "json": ">=10.0.0", "mocha": "^6.2.2", "npm-run-all": "^4.0.0", "nyc": "^15.0.0", From 33d31ad8c308212de1b9258e2e1cffd14dada9c2 Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Mon, 25 Oct 2021 17:22:14 +0200 Subject: [PATCH 6/6] Replace the matrix channel name with a link --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8121f8d..49657ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Everyone is welcome to contribute to containers. Reach out to team members if you have questions: -- Matrix chat: #containers:mozilla.org +- Matrix chat: [#containers:mozilla.org](https://matrix.to/#/#containers:mozilla.org) - Email: containers@mozilla.com ## Filing bugs