+ td.innerHTML = escaped`
+
-
`;
- context.querySelector(".container-name").textContent = identity.name;
- manage.innerHTML = "
";
+
+ `;
fragment.appendChild(tr);
- tr.appendChild(context);
+ tr.appendChild(td);
- if (hasTabs) {
- tr.appendChild(manage);
- }
-
- Logic.addEnterHandler(tr, async (e) => {
- if (e.target.matches(".open-newtab")
- || e.target.parentNode.matches(".open-newtab")
- || e.type === "keydown") {
- try {
- browser.tabs.create({
- cookieStoreId: identity.cookieStoreId
- });
- window.close();
- } catch (e) {
- window.close();
- }
- } else if (hasTabs) {
- Logic.showPanel(P_CONTAINER_INFO, identity);
- }
+ Logic.addEnterHandler(tr, () => {
+ Logic.showPanel(P_CONTAINER_INFO, identity);
});
});
- const list = document.querySelector(".identities-list tbody");
+ const list = document.querySelector("#identities-list");
list.innerHTML = "";
list.appendChild(fragment);
@@ -796,14 +729,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
document.addEventListener("mousedown", () => {
document.removeEventListener("focus", focusHandler);
});
- /* If no container is present disable the Edit Containers button */
- const editContainer = document.querySelector("#edit-containers-link");
- if (Logic.identities().length === 0) {
- editContainer.classList.add("disable-edit-containers");
- } else {
- editContainer.classList.remove("disable-edit-containers");
- }
-
return Promise.resolve();
},
});
@@ -955,68 +880,100 @@ Logic.registerPanel(P_CONTAINER_INFO, {
},
});
-// P_CONTAINERS_EDIT: Makes the list editable.
+// P_CONTAINER_PICKER: Makes the list editable.
// ----------------------------------------------------------------------------
-Logic.registerPanel(P_CONTAINERS_EDIT, {
- panelSelector: "#edit-containers-panel",
+Logic.registerPanel(P_CONTAINER_PICKER, {
+ panelSelector: "#container-picker-panel",
// This method is called when the object is registered.
initialize() {
- Logic.addEnterHandler(document.querySelector("#exit-edit-mode-link"), () => {
- Logic.showPanel(P_CONTAINERS_LIST);
- });
+ // Logic.addEnterHandler(document.querySelector("#exit-edit-mode-link"), () => {
+ // Logic.showPanel(P_CONTAINERS_LIST);
+ // });
},
// This method is called when the panel is shown.
prepare() {
const fragment = document.createDocumentFragment();
+ let pickedFunction;
+ switch (Logic.pickerType) {
+ case OPEN_NEW_CONTAINER_PICKER:
+ pickedFunction = function (identity) {
+ try {
+ browser.tabs.create({
+ cookieStoreId: identity.cookieStoreId
+ });
+ window.close();
+ } catch (e) {
+ window.close();
+ }
+ };
+ break;
+ case MANAGE_CONTAINERS_PICKER:
+ pickedFunction = function (identity) {
+ Logic.showPanel(P_CONTAINER_EDIT, identity);
+ };
+ break;
+ case REOPEN_IN_CONTAINER:
+ pickedFunction = function (identity) {
+ try {
+ browser.tabs.create({
+ cookieStoreId: identity.cookieStoreId
+ });
+ window.close();
+ } catch (e) {
+ window.close();
+ }
+ };
+ break;
+ case ALWAYS_OPEN_IN_PICKER:
+ default:
+ pickedFunction = async function (identity) {
+ const currentTab = await Logic.currentTab();
+ console.log(identity.cookieStoreId)
+ console.log(identity)
+ Logic.setOrRemoveAssignment(
+ currentTab.id,
+ currentTab.url,
+ identity.cookieStoreId,
+ false
+ );
+ window.close();
+ };
+ break;
+ }
+
Logic.identities().forEach(identity => {
const tr = document.createElement("tr");
- fragment.appendChild(tr);
- tr.classList.add("container-panel-row");
- tr.innerHTML = escaped`
-
-
-
-
+ tr.classList.add("menu-item");
+ const td = document.createElement("td");
+
+ td.innerHTML = escaped`
+ |
-
- 
- |
-
- 
- | `;
- tr.querySelector(".container-name").textContent = identity.name;
- tr.querySelector(".edit-container").setAttribute("title", `Edit ${identity.name} container`);
- tr.querySelector(".remove-container").setAttribute("title", `Remove ${identity.name} container`);
+
+
+ `;
fragment.appendChild(tr);
- tr.appendChild(context);
+ tr.appendChild(td);
- if (hasTabs) {
- tr.appendChild(manage);
- }
-
- Logic.addEnterHandler(tr, async (e) => {
- if (e.target.matches(".open-newtab")
- || e.target.parentNode.matches(".open-newtab")
- || e.type === "keydown") {
- try {
- browser.tabs.create({
- cookieStoreId: identity.cookieStoreId
- });
- window.close();
- } catch (e) {
- window.close();
- }
- } else if (hasTabs) {
- Logic.showPanel(P_CONTAINER_INFO, identity);
- }
+ Logic.addEnterHandler(tr, () => {
+ Logic.showPanel(P_CONTAINER_INFO, identity);
});
});
- const list = document.querySelector(".identities-list tbody");
+ const list = document.querySelector("#identities-list");
list.innerHTML = "";
list.appendChild(fragment);
@@ -796,14 +729,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
document.addEventListener("mousedown", () => {
document.removeEventListener("focus", focusHandler);
});
- /* If no container is present disable the Edit Containers button */
- const editContainer = document.querySelector("#edit-containers-link");
- if (Logic.identities().length === 0) {
- editContainer.classList.add("disable-edit-containers");
- } else {
- editContainer.classList.remove("disable-edit-containers");
- }
-
return Promise.resolve();
},
});
@@ -955,68 +880,100 @@ Logic.registerPanel(P_CONTAINER_INFO, {
},
});
-// P_CONTAINERS_EDIT: Makes the list editable.
+// P_CONTAINER_PICKER: Makes the list editable.
// ----------------------------------------------------------------------------
-Logic.registerPanel(P_CONTAINERS_EDIT, {
- panelSelector: "#edit-containers-panel",
+Logic.registerPanel(P_CONTAINER_PICKER, {
+ panelSelector: "#container-picker-panel",
// This method is called when the object is registered.
initialize() {
- Logic.addEnterHandler(document.querySelector("#exit-edit-mode-link"), () => {
- Logic.showPanel(P_CONTAINERS_LIST);
- });
+ // Logic.addEnterHandler(document.querySelector("#exit-edit-mode-link"), () => {
+ // Logic.showPanel(P_CONTAINERS_LIST);
+ // });
},
// This method is called when the panel is shown.
prepare() {
const fragment = document.createDocumentFragment();
+ let pickedFunction;
+ switch (Logic.pickerType) {
+ case OPEN_NEW_CONTAINER_PICKER:
+ pickedFunction = function (identity) {
+ try {
+ browser.tabs.create({
+ cookieStoreId: identity.cookieStoreId
+ });
+ window.close();
+ } catch (e) {
+ window.close();
+ }
+ };
+ break;
+ case MANAGE_CONTAINERS_PICKER:
+ pickedFunction = function (identity) {
+ Logic.showPanel(P_CONTAINER_EDIT, identity);
+ };
+ break;
+ case REOPEN_IN_CONTAINER:
+ pickedFunction = function (identity) {
+ try {
+ browser.tabs.create({
+ cookieStoreId: identity.cookieStoreId
+ });
+ window.close();
+ } catch (e) {
+ window.close();
+ }
+ };
+ break;
+ case ALWAYS_OPEN_IN_PICKER:
+ default:
+ pickedFunction = async function (identity) {
+ const currentTab = await Logic.currentTab();
+ console.log(identity.cookieStoreId)
+ console.log(identity)
+ Logic.setOrRemoveAssignment(
+ currentTab.id,
+ currentTab.url,
+ identity.cookieStoreId,
+ false
+ );
+ window.close();
+ };
+ break;
+ }
+
Logic.identities().forEach(identity => {
const tr = document.createElement("tr");
- fragment.appendChild(tr);
- tr.classList.add("container-panel-row");
- tr.innerHTML = escaped`
- 
+ 
+ 
+ 
+ 
-