From e2cfac072ed5db653a1d97753b7ae03a6cd7a39e Mon Sep 17 00:00:00 2001
From: "sdwilsh%shawnwilsher.com"
 <sdwilsh%shawnwilsher.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 3 Aug 2007 23:14:25 +0000
Subject: [PATCH] Bug 389689 - Have the dialog for nsIContentDispatchChooser
 use the width property.  r=mano, ui-r=beltzner

git-svn-id: svn://10.0.0.236/trunk@231450 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/mozapps/handling/content/dialog.js    | 8 ++++----
 mozilla/toolkit/mozapps/handling/content/dialog.xul   | 5 +++--
 mozilla/toolkit/mozapps/handling/content/handler.css  | 4 ++++
 mozilla/toolkit/mozapps/handling/content/handling.dtd | 2 ++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mozilla/toolkit/mozapps/handling/content/dialog.js b/mozilla/toolkit/mozapps/handling/content/dialog.js
index 38ec181dee2..655f1a2f3bd 100644
--- a/mozilla/toolkit/mozapps/handling/content/dialog.js
+++ b/mozilla/toolkit/mozapps/handling/content/dialog.js
@@ -210,10 +210,10 @@ var dialog = {
   */
   onCheck: function onCheck()
   {
-    document.getElementById("remember-text").hidden =
-      !document.getElementById("remember").checked;
-
-    window.sizeToContent();
+    if (document.getElementById("remember").checked)
+      document.getElementById("remember-text").setAttribute("visible", "true");
+    else
+      document.getElementById("remember-text").removeAttribute("visible");
   },
 
   /////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/toolkit/mozapps/handling/content/dialog.xul b/mozilla/toolkit/mozapps/handling/content/dialog.xul
index d8b33796767..9e4f2d556c8 100644
--- a/mozilla/toolkit/mozapps/handling/content/dialog.xul
+++ b/mozilla/toolkit/mozapps/handling/content/dialog.xul
@@ -45,7 +45,8 @@
 <dialog id="handling"
         ondialogaccept="return dialog.onAccept();"
         onload="dialog.initialize();"
-        style="width: 320px;"
+        width="&window.width;" height="&window.height;"
+        persist="width height screenX screenY sizemode"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script src="chrome://mozapps/content/handling/dialog.js" type="application/javascript"/>
@@ -73,6 +74,6 @@
   </vbox>
 
   <checkbox id="remember" oncommand="dialog.onCheck();"/>
-  <description id="remember-text" hidden="true"/>
+  <description id="remember-text"/>
 
 </dialog>
diff --git a/mozilla/toolkit/mozapps/handling/content/handler.css b/mozilla/toolkit/mozapps/handling/content/handler.css
index b9f53c1859b..e30f5ce4e49 100644
--- a/mozilla/toolkit/mozapps/handling/content/handler.css
+++ b/mozilla/toolkit/mozapps/handling/content/handler.css
@@ -1,3 +1,7 @@
 richlistitem[type="handler"] {
   -moz-binding: url('chrome://mozapps/content/handling/handler.xml#handler');
 }
+
+#remember-text:not([visible]) {
+  visibility: hidden;
+}
diff --git a/mozilla/toolkit/mozapps/handling/content/handling.dtd b/mozilla/toolkit/mozapps/handling/content/handling.dtd
index 4220fbddd6c..4f169bfb0ca 100644
--- a/mozilla/toolkit/mozapps/handling/content/handling.dtd
+++ b/mozilla/toolkit/mozapps/handling/content/handling.dtd
@@ -1,3 +1,5 @@
+<!ENTITY window.width "320">
+<!ENTITY window.height "250">
 <!ENTITY ChooseApp.description "Choose an Application">
 <!ENTITY ChooseApp.label "Choose...">
 <!ENTITY ChooseApp.accessKey "C">