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

Merge branch 'issue-1624-backend-logic' of github.com:CSCD01/multi-account-containers-team05 into issue-1624-backend-logic

Browse source
This commit is contained in:
joey 2020-03-11 13:07:37 -04:00
commit 9fe75610ad
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/js/popup.js
View file

@ -1329,6 +1329,9 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
prepare() { prepare() {
// if current identity is not null, then show single container information, otherwise show all selected // if current identity is not null, then show single container information, otherwise show all selected
let currentSelection; let currentSelection;
let totalNumberOfTabs = 0;
let containerString = "";
try { try {
currentSelection = [Logic.currentIdentity()]; currentSelection = [Logic.currentIdentity()];
} catch (e) { } catch (e) {
@ -1336,22 +1339,32 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
} }
// right now for mult-selection, it displays the first item in the selection at the icon and name // right now for mult-selection, it displays the first item in the selection at the icon and name
// Populating the panel: name, icon, and warning message // Populating the panel: name, icon, and warning message
document.getElementById("delete-container-name").textContent = currentSelection[0].name; document.getElementById("delete-container-tab-warning").textContent = ``;
document.getElementById("delete-container-tab-warning").textContent = "";
for (let i = 0; i < currentSelection.length; i++) { for (let i = 0; i < currentSelection.length; i++) {
const identity = currentSelection[i]; const identity = currentSelection[i];
const totalNumberOfTabs = identity.numberOfHiddenTabs + identity.numberOfOpenTabs; totalNumberOfTabs += identity.numberOfHiddenTabs + identity.numberOfOpenTabs;
let warningMessage = "";
if (totalNumberOfTabs > 0) {
const grammaticalNumTabs = totalNumberOfTabs > 1 ? "tabs" : "tab";
warningMessage =`If you remove ${identity.name} container now, ${totalNumberOfTabs} container ${grammaticalNumTabs} will be closed.`;
}
document.getElementById("delete-container-tab-warning").textContent += warningMessage;
const icon = document.getElementById("delete-container-icon");
icon.setAttribute("data-identity-icon", identity.icon);
icon.setAttribute("data-identity-color", identity.color);
} }
console.log(currentSelection.length);
const icon = document.getElementById("delete-container-icon");
if (currentSelection.length === 1 ) {
document.getElementById("delete-container-name").textContent = currentSelection[0].name;
icon.style.visibility = 'visible';
icon.style.marginLeft = `0px`;
icon.setAttribute("data-identity-icon", currentSelection[0].icon);
icon.setAttribute("data-identity-color", currentSelection[0].color);
containerString = "this container";
} else {
icon.style.visibility = 'hidden';
icon.style.marginLeft = `-16px`;
document.getElementById("delete-container-name").textContent = `Containers`;
containerString = "this " + currentSelection.length + " containers";
}
let warningMessage = "";
if (totalNumberOfTabs > 0) {
const grammaticalNumTabs = totalNumberOfTabs > 1 ? "tabs" : "tab";
warningMessage =`If you remove ${containerString} now, ${totalNumberOfTabs} container ${grammaticalNumTabs} will be closed.`;
}
document.getElementById("delete-container-tab-warning").textContent += warningMessage + ` Are you sure you want to remove ${containerString}?`;
return Promise.resolve(null); return Promise.resolve(null);
}, },
}); });

2
src/popup.html
View file

@ -228,7 +228,7 @@
</div> </div>
<div class="panel-content delete-container-confirm"> <div class="panel-content delete-container-confirm">
<h4 class="delete-container-confirm-title">Remove This Container</h4> <h4 class="delete-container-confirm-title">Remove This Container</h4>
<p><span id="delete-container-tab-warning"></span> Are you sure you want to remove this Container?</p> <p id="delete-container-tab-warning"></p>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<a href="#" class="button expanded secondary footer-button cancel-button" id="delete-container-cancel-link">Cancel</a> <a href="#" class="button expanded secondary footer-button cancel-button" id="delete-container-cancel-link">Cancel</a>