Skip to content

Enable "always open in current container" configuration by domain #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmorlitz wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Enable "always open in current container" configuration by domain #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f9fdaf
Update containers.js
Nov 10, 2021
795b358
Added "keep in current container" config parm
Nov 10, 2021
46a07e0
Properly handle blank configuration variable
Nov 11, 2021
95833e7
Delete containers.js
Nov 11, 2021
c3d101c
Gracefully handle undefined configuration variable
Nov 11, 2021
30a6036
Merge branch 'master' of https://github.com/dmorlitz/containerise
Nov 11, 2021
40b0151
Gracefully handle undefined configuration variable
Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/containers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,19 @@ async function handle(url, tabId) {
delete creatingTabs[tabId];
}
let preferences = await PreferenceStorage.getAll(true);
let OPEN_IN_CURRENT_CONTAINER_RAW = preferences.openInCurrentContainer;
//console.debug('Raw configuration variable --> ', OPEN_IN_CURRENT_CONTAINER_RAW);
if (typeof OPEN_IN_CURRENT_CONTAINER_RAW !== 'undefined') {
const OPEN_IN_CURRENT_CONTAINER = '(' + preferences.openInCurrentContainer.replace(/ /g, '') + ')/';
//console.debug('Formatted configuration variable --> ', OPEN_IN_CURRENT_CONTAINER);
if (OPEN_IN_CURRENT_CONTAINER !== '') {
let OPEN_IN_CURRENT_CONTAINER_REGEX = new RegExp(OPEN_IN_CURRENT_CONTAINER);
if (OPEN_IN_CURRENT_CONTAINER_REGEX.test(url)) {
//console.debug('URL was left in current container due to Regex--> ', url);
return;
}
}
}
let [hostMap, identities, currentTab] = await Promise.all([
Storage.get(url, preferences.matchDomainOnly),
ContextualIdentity.getAll(),
Expand Down
7 changes: 7 additions & 0 deletions src/ui-preferences/preferences.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
"label": "Keep old tabs",
"description": "After a contained tab has been created, the old won't be closed"
},
{
"type": "string",
"name": "openInCurrentContainer",
"label": "Open in current container",
"description": "A list of domains separated by a pipe (|) which will *always* open in the current container that opened them",
"defaultValue": ""
},
{
"type": "group",
"name": "defaultContainer",
Expand Down