From 5a79023d0a81fd0e48d10dfbd376c95238994636 Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com" <ben%bengoodger.com>
Date: Sun, 20 Feb 2005 21:51:30 +0000
Subject: [PATCH] 282872 - downloads dialog OK must be clicked twice to start
 download

---
 toolkit/content/commonDialog.js                      | 12 ++++++++----
 .../mozapps/downloads/content/unknownContentType.xul |  2 +-
 toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in   |  8 ++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/toolkit/content/commonDialog.js b/toolkit/content/commonDialog.js
index b02edf3d4a34..85fb1d1a073d 100644
--- a/toolkit/content/commonDialog.js
+++ b/toolkit/content/commonDialog.js
@@ -202,8 +202,8 @@ function commonDialogOnLoad()
 
     setTimeout(commonDialogReenableButtons, delayInterval);
     
-    document.documentElement.addEventListener("blur", commonDialogBlur, false);
-    document.documentElement.addEventListener("focus", commonDialogFocus, false);
+    addEventListener("blur", commonDialogBlur, false);
+    addEventListener("focus", commonDialogFocus, false);
   }
 
   getAttention();
@@ -212,16 +212,20 @@ function commonDialogOnLoad()
 var gDelayExpired = false;
 var gBlurred = false;
 
-function commonDialogBlur()
+function commonDialogBlur(aEvent)
 {
+  if (aEvent.target != document)
+    return;
   gBlurred = true;
   document.documentElement.getButton("accept").disabled = true;
   document.documentElement.getButton("extra1").disabled = true;
   document.documentElement.getButton("extra2").disabled = true;
 }
 
-function commonDialogFocus()
+function commonDialogFocus(aEvent)
 {
+  if (aEvent.target != document)
+    return;
   gBlurred = false;
   // When refocusing the window, don't enable the buttons unless the countdown
   // delay has expired. 
diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xul b/toolkit/mozapps/downloads/content/unknownContentType.xul
index 15a0c4853bdd..2f7445a4fd1f 100755
--- a/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xul
@@ -51,7 +51,7 @@
 <dialog id="unknownContentType"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="dialog.initDialog();" onunload="if (dialog) dialog.onCancel();"
-        onblur="dialog.onBlur();" onfocus="dialog.onFocus();"
+        onblur="dialog.onBlur(event);" onfocus="dialog.onFocus(event);"
         style="width: 34em;"
         screenX="" screenY=""
         persist="screenX screenY"
diff --git a/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in b/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
index 1a9a67347c97..4b63cb5cfb50 100644
--- a/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
+++ b/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
@@ -517,12 +517,16 @@ nsUnknownContentTypeDialog.prototype = {
     
     _blurred: false,
     _delayExpired: false, 
-    onBlur: function() {
+    onBlur: function(aEvent) {
+      if (aEvent.target != this.mDialog.document)
+        return;
       this._blurred = true;
       this.mDialog.document.documentElement.getButton("accept").disabled = true;
     },
     
-    onFocus: function() {
+    onFocus: function(aEvent) {
+      if (aEvent.target != this.mDialog.document)
+        return;
       this._blurred = false;
       if (this._delayExpired) {
         var script = "document.documentElement.getButton('accept').disabled = false";