From 75045a0ba954bcb94a45959f5edc170342583015 Mon Sep 17 00:00:00 2001
From: QiiLin <qii.lin@mail.utoronto.ca>
Date: Wed, 11 Mar 2020 11:08:06 -0400
Subject: [PATCH 1/2] update confirm

---
 src/js/popup.js | 39 ++++++++++++++++++++++++++-------------
 src/popup.html  |  2 +-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 2a2afcd..b29ba51 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1329,6 +1329,9 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
   prepare() {
     // if current identity is not null, then show single container information, otherwise show all selected
     let currentSelection;
+    let totalNumberOfTabs = 0;
+    let containerString = "";
+
     try {
       currentSelection = [Logic.currentIdentity()];
     } 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
     // 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++) {
       const identity = currentSelection[i];
-      const 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);
+      totalNumberOfTabs += identity.numberOfHiddenTabs + identity.numberOfOpenTabs;
     }
+    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 = "those " + 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);
   },
 });
diff --git a/src/popup.html b/src/popup.html
index 8e03d4d..6cae7fd 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -228,7 +228,7 @@
     </div>
     <div class="panel-content delete-container-confirm">
       <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 class="panel-footer">
       <a href="#" class="button expanded secondary footer-button cancel-button" id="delete-container-cancel-link">Cancel</a>

From e5653a0b6eba78e8103bf3f6d688cedc68796b8f Mon Sep 17 00:00:00 2001
From: QiiLin <qii.lin@mail.utoronto.ca>
Date: Wed, 11 Mar 2020 12:18:28 -0400
Subject: [PATCH 2/2] update wording

---
 src/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index b29ba51..9e786a2 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1357,7 +1357,7 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
       icon.style.visibility = 'hidden';
       icon.style.marginLeft = `-16px`;
       document.getElementById("delete-container-name").textContent = `Containers`;
-      containerString = "those " + currentSelection.length + " containers";
+      containerString = "this " + currentSelection.length + " containers";
     }
     let warningMessage = "";
     if (totalNumberOfTabs > 0) {