rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #91 from bakulf/tablist

Browse source 
many things, all together in 1 big PR
This commit is contained in:
Andrea Marchesini 2017-01-19 08:56:57 +01:00 • committed by GitHub
commit fe41394da8
2 changed files with 55 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
index.js
View file

@ -160,16 +160,16 @@ const ContainerService = {
return parseInt(viewFor(tab).getAttribute("usercontextid") || 0, 10);
},
_getTabList(userContextId) {
const list = [];
_createTabObject(tab) {
return { title: tab.title, url: tab.url, id: tab.id, active: true };
},
_containerTabIterator(userContextId, cb) {
for (let tab of tabs) { // eslint-disable-line prefer-const
if (userContextId === this._getUserContextIdFromTab(tab)) {
const object = { title: tab.title, url: tab.url, id: tab.id };
list.push(object);
cb(tab);
}
}
return list;
},
// Tabs management
@ -181,14 +181,22 @@ const ContainerService = {
return;
}
for (let tab of tabs) { // eslint-disable-line prefer-const
if (args.userContextId !== this._getUserContextIdFromTab(tab)) {
continue;
}
this._containerTabIterator(args.userContextId, tab => {
const object = this._createTabObject(tab);
this._identitiesState[args.userContextId].hiddenTabUrls.push(tab.url);
// This tab is going to be closed. Let's mark this tabObject as
// non-active.
object.active = false;
getFavicon(object.url).then(url => {
object.favicon = url;
}).catch(() => {
object.favicon = "";
});
this._identitiesState[args.userContextId].hiddenTabUrls.push(object);
tab.close();
}
});
resolve(null);
});
@ -201,8 +209,8 @@ const ContainerService = {
const promises = [];
for (let url of this._identitiesState[args.userContextId].hiddenTabUrls) { // eslint-disable-line prefer-const
promises.push(this.openTab({ userContextId: args.userContextId, url }));
for (let object of this._identitiesState[args.userContextId].hiddenTabUrls) { // eslint-disable-line prefer-const
promises.push(this.openTab({ userContextId: args.userContextId, url: object.url }));
}
this._identitiesState[args.userContextId].hiddenTabUrls = [];
@ -267,19 +275,23 @@ const ContainerService = {
return;
}
const list = this._getTabList(args.userContextId);
const list = [];
this._containerTabIterator(args.userContextId, tab => {
list.push(this._createTabObject(tab));
});
const promises = [];
for (let object of list) { // eslint-disable-line prefer-const
promises.push(getFavicon(object.url).then(url => {
object.favicon = url;
}, () => {
}).catch(() => {
object.favicon = "";
}));
}
Promise.all(promises).then(() => {
resolve(list);
resolve(list.concat(this._identitiesState[args.userContextId].hiddenTabUrls));
}).catch((e) => {
reject(e);
});
@ -313,7 +325,10 @@ const ContainerService = {
}
// Let's create a list of the tabs.
const list = this._getTabList(args.userContextId);
const list = [];
this._containerTabIterator(args.userContextId, tab => {
list.push(tab);
});
// Nothing to do
if (list.length === 0) {
@ -329,7 +344,7 @@ const ContainerService = {
// Let's move the tab to the new window.
for (let tab of list) { // eslint-disable-line prefer-const
const newTab = newBrowserWindow.gBrowser.addTab("about:blank");
newBrowserWindow.gBrowser.swapBrowsersAndCloseOther(newTab, tab);
newBrowserWindow.gBrowser.swapBrowsersAndCloseOther(newTab, viewFor(tab));
// swapBrowsersAndCloseOther is an internal method of gBrowser
// an it's not supported by addon SDK. This means that we
// don't receive an 'open' event, but only the 'close' one.
@ -438,6 +453,11 @@ const ContainerService = {
if (!("userContextId" in args)) {
return Promise.reject("removeIdentity must be called with userContextId argument.");
}
this._containerTabIterator(args.userContextId, tab => {
tab.close();
});
return Promise.resolve(ContextualIdentityService.remove(args.userContextId));
},

28
webextension/js/popup.js
View file

@ -295,7 +295,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
// Show or not the has-tabs section.
for (let trHasTabs of document.getElementsByClassName("container-info-has-tabs")) { // eslint-disable-line prefer-const
trHasTabs.hidden = !identity.hasHiddenTabs && !identity.hasOpenTabs;
trHasTabs.style.display = !identity.hasHiddenTabs && !identity.hasOpenTabs ? "none" : "";
}
const hideShowIcon = document.getElementById("container-info-hideorshow-icon");
@ -320,21 +320,25 @@ Logic.registerPanel(P_CONTAINER_INFO, {
for (let tab of tabs) { // eslint-disable-line prefer-const
const tr = document.createElement("tr");
fragment.appendChild(tr);
tr.classList.add("container-info-tab", "clickable");
tr.classList.add("container-info-tab");
tr.innerHTML = `
<td><img class="icon" src="${tab.favicon}" /></td>
<td>${tab.title}</td>`;
// On click, we activate this tab.
tr.addEventListener("click", () => {
browser.runtime.sendMessage({
method: "showTab",
tabId: tab.id,
}).then(() => {
window.close();
}).catch(() => {
window.close();
// On click, we activate this tab. But only if this tab is active.
if (tab.active) {
tr.classList.add("clickable");
tr.addEventListener("click", () => {
browser.runtime.sendMessage({
method: "showTab",
tabId: tab.id,
}).then(() => {
window.close();
}).catch(() => {
window.close();
});
});
});
}
}
document.getElementById("container-info-table").appendChild(fragment);