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

Fixing popup to use tabId for messaging assignment change

Browse source
This commit is contained in:
Jonathan Kingston 2017-06-13 15:02:47 +01:00
parent cd2e110c17
commit 090ae1f139
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
webextension/js/popup.js
View file

@ -247,9 +247,10 @@ const Logic = {
}); });
}, },
setOrRemoveAssignment(url, userContextId, value) { setOrRemoveAssignment(tabId, url, userContextId, value) {
return browser.runtime.sendMessage({ return browser.runtime.sendMessage({
method: "setOrRemoveAssignment", method: "setOrRemoveAssignment",
tabId,
url, url,
userContextId, userContextId,
value value
@ -452,7 +453,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
const assignmentCheckboxElement = document.getElementById("container-page-assigned"); const assignmentCheckboxElement = document.getElementById("container-page-assigned");
assignmentCheckboxElement.addEventListener("change", () => { assignmentCheckboxElement.addEventListener("change", () => {
const userContextId = Logic.userContextId(currentTab.cookieStoreId); const userContextId = Logic.userContextId(currentTab.cookieStoreId);
Logic.setOrRemoveAssignment(currentTab.url, userContextId, !assignmentCheckboxElement.checked); Logic.setOrRemoveAssignment(currentTab.id, currentTab.url, userContextId, !assignmentCheckboxElement.checked);
}); });
currentTabElement.hidden = !currentTab; currentTabElement.hidden = !currentTab;
this.setupAssignmentCheckbox(false); this.setupAssignmentCheckbox(false);
@ -806,10 +807,14 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
const deleteButton = trElement.querySelector(".delete-assignment"); const deleteButton = trElement.querySelector(".delete-assignment");
Logic.addEnterHandler(deleteButton, () => { Logic.addEnterHandler(deleteButton, () => {
const userContextId = Logic.currentUserContextId(); const userContextId = Logic.currentUserContextId();
Logic.setOrRemoveAssignment(assumedUrl, userContextId, true); // Lets show the message to the current tab
// TODO remove then when firefox supports arrow fn async
Logic.currentTab().then((currentTab) => {
Logic.setOrRemoveAssignment(currentTab.id, assumedUrl, userContextId, true);
delete assignments[siteKey]; delete assignments[siteKey];
this.showAssignedContainers(assignments); this.showAssignedContainers(assignments);
}); });
});
trElement.classList.add("container-info-tab-row", "clickable"); trElement.classList.add("container-info-tab-row", "clickable");
tableElement.appendChild(trElement); tableElement.appendChild(trElement);
}); });