From 85d18dbb4a37173fff7c33809ad9b69c9235c909 Mon Sep 17 00:00:00 2001
From: "law%netscape.com" <law%netscape.com>
Date: Thu, 11 Oct 2001 22:09:56 +0000
Subject: [PATCH] Fix for bugs 67803/74012/79862/98797.  Adds code to set
 initial focus to downloading and progress dialogs, and removes code to
 disable the "close this dialog" checkbox from the progress dialog.  r=aaronl,
 sr=ben

---
 embedding/components/ui/helperAppDlg/nsHelperAppDlg.js | 3 +++
 xpfe/components/ucth/resources/helperAppDldProgress.js | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
index a901f015342d..d49a92fc85b4 100644
--- a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
+++ b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
@@ -243,6 +243,9 @@ nsHelperAppDialog.prototype = {
          } else {
              this.mDialog.centerWindowOnScreen();
          }
+
+         // Set initial focus
+         this.dialogElement( "mode" ).focus();
     },
 
     // initIntro:
diff --git a/xpfe/components/ucth/resources/helperAppDldProgress.js b/xpfe/components/ucth/resources/helperAppDldProgress.js
index 872e27f0598d..b29f9938bf36 100644
--- a/xpfe/components/ucth/resources/helperAppDldProgress.js
+++ b/xpfe/components/ucth/resources/helperAppDldProgress.js
@@ -353,6 +353,12 @@ function onLoad() {
     } else {
         centerWindowOnScreen();
     }
+    
+    // Set initial focus
+    if ( !completed )
+    {
+        keepProgressWindowUpBox.focus();
+    }
 }
 
 function onUnload()
@@ -417,6 +423,7 @@ function setupPostProgressUI()
   {
     cancelButton.label = getString("close");
     cancelButton.setAttribute("onclick", "window.close()");
+    cancelButton.focus();
   }
 
   // enable the open and open folder buttons
@@ -431,7 +438,6 @@ function setupPostProgressUI()
 
   dialog.pause.disabled = true; // setAttribute("disabled", true);
   dialog.resume.disabled = true;
-  keepProgressWindowUpBox.disabled = true;
   
 }