Bug 1679269 - remove <deck> XUL element from removeAccount.xhtml dialog. r=aleca

mailnews/base/prefs/content/removeAccount.js

@@ -83,7 +83,6 @@ function openLocalDirectory() {
 }
 
 function showInfo() {
-  let removeAccountBox = document.getElementById("removeAccountBox");
   let descs = document.querySelectorAll("vbox.indent");
   for (let desc of descs) {
     desc.collapsed = false;
@@ -98,7 +97,7 @@ function showInfo() {
     document.getElementById("localAccount").collapsed = false;
   }
 
-  window.resizeBy(0, removeAccountBox.getBoundingClientRect().height);
+  parent.gSubDialog._topDialog.resizeDialog();
   gDialog.getButton("disclosure").disabled = true;
   gDialog.getButton("disclosure").blur();
 }
@@ -128,16 +127,13 @@ function removeAccount() {
       window.arguments[0].result = false;
     }
 
-    document.getElementById("status").selectedPanel = document.getElementById(
-      "success"
-    );
+    document.getElementById("success").hidden = false;
   } catch (ex) {
-    document.getElementById("status").selectedPanel = document.getElementById(
-      "failure"
-    );
+    document.getElementById("failure").hidden = false;
     Cu.reportError("Failure to remove account: " + ex);
     window.arguments[0].result = false;
   }
+  document.getElementById("progress").hidden = true;
 }
 
 function onAccept(event) {
@@ -158,7 +154,8 @@ function onAccept(event) {
   gDialog.getButton("accept").removeAttribute("accesskey");
   gDialog.buttons = "accept";
 
-  document.getElementById("infoPane").selectedIndex = 1;
+  document.getElementById("removeAccountSection").hidden = true;
+  document.getElementById("confirmationSection").hidden = false;
   window.sizeToContent();
 
   removeAccount();

mailnews/base/prefs/content/removeAccount.xhtml

@@ -27,22 +27,21 @@
   <stringbundle id="bundle_removeAccount"
                 src="chrome://messenger/locale/removeAccount.properties"/>
   <script src="chrome://messenger/content/removeAccount.js"/>
-  <deck id="infoPane">
-    <vbox flex="1">
-      <label id="accountName"></label>
-      <separator class="thin"/>
-      <checkbox id="removeAccount"
-                label="&removeAccount.label;"
-                checked="true"
-                disabled="true"
-                accesskey="&removeAccount.accesskey;"
-                oncommand="enableRemove();"/>
-      <vbox class="indent" collapsed="true">
-        <description>
-          &removeAccount.desc;
-        </description>
-      </vbox>
-      <vbox id="removeDataPossibility" collapsed="false">
+  <vbox id="removeAccountSection">
+    <label id="accountName"></label>
+    <separator class="thin"/>
+    <checkbox id="removeAccount"
+              label="&removeAccount.label;"
+              checked="true"
+              disabled="true"
+              accesskey="&removeAccount.accesskey;"
+              oncommand="enableRemove();"/>
+    <vbox class="indent" collapsed="true">
+      <description>
+        &removeAccount.desc;
+      </description>
+    </vbox>
+    <vbox id="removeDataPossibility" collapsed="false">
       <checkbox id="removeData"
                 label="&removeData.label;"
                 labelChat="&removeDataChat.label;"
@@ -67,20 +66,15 @@
           <label id="localDirectory" collapsed="true"/>
         </hbox>
       </vbox>
-      </vbox>
     </vbox>
-    <vbox align="center">
-      <spacer flex="1"/>
-      <deck id="status">
-        <vbox align="center">
-          <label>&progressPending;</label>
-          <html:progress max="100"/>
-        </vbox>
-        <label id="success">&progressSuccess;</label>
-        <label id="failure">&progressFailure;</label>
-      </deck>
-      <spacer flex="1"/>
+  </vbox>
+  <vbox id="confirmationSection" align="center" pack="center" flex="1" hidden="true">
+    <vbox id="progress" align="center">
+      <label>&progressPending;</label>
+      <html:progress max="100"/>
     </vbox>
-  </deck>
+    <label id="success" hidden="true">&progressSuccess;</label>
+    <label id="failure" hidden="true">&progressFailure;</label>
+  </vbox>
 </dialog>
 </window>