From 77de5bc58b6c943960ebc456d30f1ffaf1ef8af5 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Fri, 15 May 2009 09:42:08 -0700
Subject: [PATCH] Bug 491638 - Clear recent history dialog should persist
 details expansion, r=johnath

---
 browser/base/content/sanitize.xul             |  3 +-
 browser/base/content/sanitizeDialog.js        |  4 +-
 .../content/test/browser_sanitizeDialog.js    | 55 +++++++++++++++++--
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/sanitize.xul b/browser/base/content/sanitize.xul
index edb5580b8d20..d14de717893d 100644
--- a/browser/base/content/sanitize.xul
+++ b/browser/base/content/sanitize.xul
@@ -169,13 +169,14 @@
       <button type="image"
               id="detailsExpander"
               class="expander-down"
+              persist="class"
               oncommand="gSanitizePromptDialog.toggleItemList();"/>
       <label id="detailsExpanderLabel"
              value="&detailsProgressiveDisclosure.label;"
              accesskey="&detailsProgressiveDisclosure.accesskey;"
              control="detailsExpander"/>
     </hbox>
-    <listbox id="itemList" rows="4" collapsed="true">
+    <listbox id="itemList" rows="4" collapsed="true" persist="collapsed">
       <listitem label="&itemHistoryAndDownloads.label;"
                 type="checkbox"
                 accesskey="&itemHistoryAndDownloads.accesskey;"
diff --git a/browser/base/content/sanitizeDialog.js b/browser/base/content/sanitizeDialog.js
index 964833d42b58..8572369102fa 100644
--- a/browser/base/content/sanitizeDialog.js
+++ b/browser/base/content/sanitizeDialog.js
@@ -255,14 +255,14 @@ var gSanitizePromptDialog = {
     // Showing item list
     if (itemList.collapsed) {
       expanderButton.className = "expander-up";
-      itemList.collapsed = false;
+      itemList.setAttribute("collapsed", "false");
       window.resizeBy(0, itemList.boxObject.height);
     }
     // Hiding item list
     else {
       expanderButton.className = "expander-down";
       window.resizeBy(0, -itemList.boxObject.height);
-      itemList.collapsed = true;
+      itemList.setAttribute("collapsed", "true");
     }
   }
 
diff --git a/browser/base/content/test/browser_sanitizeDialog.js b/browser/base/content/test/browser_sanitizeDialog.js
index 1148dc5ecbed..f049ab9f7a58 100644
--- a/browser/base/content/test/browser_sanitizeDialog.js
+++ b/browser/base/content/test/browser_sanitizeDialog.js
@@ -85,9 +85,15 @@ var gAllTests = [
     wh.onload = function () {
       this.selectDuration(Sanitizer.TIMESPAN_HOUR);
       this.checkPrefCheckbox("history", false);
-      this.checkDetails();
+      this.checkDetails(false);
+
+      // Show details
       this.toggleDetails();
-      this.checkDetails();
+      this.checkDetails(true);
+
+      // Hide details
+      this.toggleDetails();
+      this.checkDetails(false);
       this.cancelDialog();
 
       ensureHistoryClearedState(uris, false);
@@ -226,9 +232,16 @@ var gAllTests = [
          "with a predefined timespan");
       this.selectDuration(Sanitizer.TIMESPAN_EVERYTHING);
       this.checkPrefCheckbox("history", true);
-      this.checkDetails();
+      this.checkDetails(false);
+
+      // Show details
       this.toggleDetails();
-      this.checkDetails();
+      this.checkDetails(true);
+
+      // Hide details
+      this.toggleDetails();
+      this.checkDetails(false);
+
       this.acceptDialog();
 
       intPrefIs("sanitize.timeSpan", Sanitizer.TIMESPAN_EVERYTHING,
@@ -266,6 +279,32 @@ var gAllTests = [
       ensureHistoryClearedState(uris, true);
     };
     wh.open();
+  },
+
+  /**
+   * Ensures that toggling details persists across dialog openings.
+   */
+  function () {
+    let wh = new WindowHelper();
+
+    wh.onload = function () {
+      // Show details
+      this.toggleDetails();
+      this.checkDetails(true);
+      this.cancelDialog();
+    };
+    wh.open();
+
+    wh.onload = function () {
+      // Details should have remained open
+      this.checkDetails(true);
+      
+      // Hide details
+      this.toggleDetails();
+      this.checkDetails(false);
+      this.cancelDialog();
+    };
+    wh.open();
   }
 ];
 
@@ -313,11 +352,17 @@ WindowHelper.prototype = {
    * Ensures that the details progressive disclosure button and the item list
    * hidden by it match up.  Also makes sure the height of the dialog is
    * sufficient for the item list and warning panel.
+   *
+   * @param aShouldBeShown
+   *        True if you expect the details to be shown and false if hidden
    */
-  checkDetails: function () {
+  checkDetails: function (aShouldBeShown) {
     let button = this.getDetailsButton();
     let list = this.getItemList();
     let hidden = list.hidden || list.collapsed;
+    is(hidden, !aShouldBeShown,
+       "Details should be " + (aShouldBeShown ? "shown" : "hidden") +
+       " but were actually " + (hidden ? "hidden" : "shown"));
     let dir = hidden ? "down" : "up";
     is(button.className, "expander-" + dir,
        "Details button should be " + dir + " because item list is " +