Bug 1578463 - Mop up ondialogaccept in mail(news). r=aceman,jorgk DONTBUILD

mail/components/addrbook/content/abCard.js

@@ -354,10 +354,11 @@ function OnLoadEditCard() {
         document.getElementById("preferDisplayName").disabled = true;
 
         document.documentElement.buttons = "accept";
-        document.documentElement.removeAttribute("ondialogaccept");
+        return;
       }
     }
   }
+  document.addEventListener("dialogaccept", EditCardOKButton);
 }
 
 /* Registers functions that are called when loading the card

mail/components/addrbook/content/abEditCardDialog.xul

@@ -22,7 +22,6 @@
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script src="chrome://messenger/content/addressbook/abCard.js"/>
   <script><![CDATA[
-    document.addEventListener("dialogaccept", EditCardOKButton);
     document.addEventListener("dialogcancel", EditCardCancelButton);
   ]]></script>
 

mail/components/addrbook/content/abEditListDialog.xul

@@ -22,9 +22,6 @@
   <script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
   <script src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
-  <script><![CDATA[
-    document.addEventListener("dialogaccept", EditListOKButton);
-  ]]></script>
 
   <vbox id="editlist">
     <hbox id="ListNameContainer" align="center">

mail/components/cloudfile/content/selectDialog.xul

@@ -9,8 +9,7 @@
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="cloudfileDialogOnLoad()"
-      ondialogaccept="return dialogOK();">
+      onload="cloudfileDialogOnLoad();">
 
   <script type="application/javascript" src="chrome://messenger/content/cloudfile/selectDialog.js" />
   <script type="application/javascript" src="chrome://global/content/selectDialog.js" />

mailnews/addrbook/content/abAddressBookNameDialog.js

@@ -19,8 +19,6 @@ var kCollectedAddressbookURI = "moz-abmdbdirectory://history.mab";
 var kAllDirectoryRoot = "moz-abdirectory://";
 var kPABDirectory = 2; // defined in nsDirPrefs.h
 
-document.addEventListener("dialogaccept", abNameOKButton);
-
 function abNameOnLoad() {
   // Get the document elements.
   gOkButton = document.documentElement.getButton("accept");
@@ -59,8 +57,8 @@ function abNameOnLoad() {
     // only have an ok button that doesn't do anything.
     gNameInput.readOnly = true;
     document.documentElement.buttons = "accept";
-    document.documentElement.removeAttribute("ondialogaccept");
   } else {
+    document.addEventListener("dialogaccept", abNameOKButton);
     gNameInput.focus();
     abNameDoOkEnabling();
   }

mailnews/addrbook/content/abMailListDialog.js

@@ -285,13 +285,14 @@ function OnLoadEditList() {
     }
 
     document.documentElement.buttons = "accept";
-    document.documentElement.removeAttribute("ondialogaccept");
 
     // Getting a sane read-only implementation for the addressing widget would
     // basically need a separate dialog. Given I'm not sure about the future of
     // the mailing list dialog in its current state, let's just disable it
     // completely.
     document.getElementById("addressingWidget").disabled = true;
+  } else {
+    document.addEventListener("dialogaccept", EditListOKButton);
   }
 
   if (AppConstants.MOZ_APP_NAME == "seamonkey") {

mailnews/extensions/smime/content/am-smime.js

@@ -29,8 +29,6 @@ var gSigningChoicesLocked;
 var kEncryptionCertPref = "identity.encryption_cert_name";
 var kSigningCertPref = "identity.signing_cert_name";
 
-document.addEventListener("dialogaccept", smimeOnAcceptEditor);
-
 function onInit() {
   smimeInitializeFields();
 }
@@ -523,9 +521,5 @@ function openDeviceManager() {
 
 function smimeOnLoadEditor() {
   smimeInitializeFields();
-
-  document.documentElement.setAttribute(
-    "ondialogaccept",
-    "return smimeOnAcceptEditor();"
-  );
+  document.addEventListener("dialogaccept", smimeOnAcceptEditor);
 }