Bug 1522778 - Fix broken loading of preference tab subdialogs. r=aceman,jorgk a=jorgk
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 08 Feb 2019 23:51:31 +1300
changeset 33476 6dbb5631f6ae
parent 33475 2d307b1bc4a3
child 33477 77e45ce80f01
push id2372
push usermozilla@jorgk.com
push dateFri, 08 Feb 2019 14:40:49 +0000
treeherdercomm-beta@bb3d6c799a6b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaceman, jorgk, jorgk
bugs1522778
Bug 1522778 - Fix broken loading of preference tab subdialogs. r=aceman,jorgk a=jorgk
mail/base/content/sanitize.xul
mail/components/preferences/attachmentReminder.xul
mail/components/preferences/receipts.xul
mail/components/preferences/sendoptions.xul
--- a/mail/base/content/sanitize.xul
+++ b/mail/base/content/sanitize.xul
@@ -4,32 +4,33 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/sanitizeDialog.css"?>
 <?xml-stylesheet href="chrome://messenger/content/sanitizeDialog.css"?>
 
-<!DOCTYPE prefwindow [
+<!DOCTYPE dialog [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   <!ENTITY % sanitizeDTD SYSTEM "chrome://messenger/locale/sanitize.dtd">
   %brandDTD;
   %sanitizeDTD;
 ]>
 
-<prefwindow id="SanitizeDialog" type="child"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            dlgbuttons="accept,cancel"
-            title="&sanitizeDialog2.title;"
-            noneverythingtitle="&sanitizeDialog2.title;"
-            style="width: &dialog.width;"
-            ondialogaccept="gSanitizePromptDialog.sanitize();">
+<dialog id="SanitizeDialog" type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        dlgbuttons="accept,cancel"
+        title="&sanitizeDialog2.title;"
+        noneverythingtitle="&sanitizeDialog2.title;"
+        style="width: &dialog.width;"
+        onload="gSanitizePromptDialog.init();"
+        ondialogaccept="gSanitizePromptDialog.sanitize();">
 
-  <prefpane id="SanitizeDialogPane" onpaneload="gSanitizePromptDialog.init();">
+  <vbox id="SanitizeDialogPane">
     <stringbundle id="bundleBrowser"
             src="chrome://messenger/locale/messenger.properties"/>
 
     <script type="application/javascript"
             src="chrome://messenger/content/sanitize.js"/>
 
     <script type="application/javascript"
             src="chrome://messenger/content/sanitizeDialog.js"/>
@@ -105,10 +106,10 @@
                 preference="privacy.cpd.cookies"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
       <checkbox label="&itemCache.label;"
                 accesskey="&itemCache.accesskey;"
                 preference="privacy.cpd.cache"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
     </vbox>
 
-  </prefpane>
-</prefwindow>
+  </vbox>
+</dialog>
--- a/mail/components/preferences/attachmentReminder.xul
+++ b/mail/components/preferences/attachmentReminder.xul
@@ -12,22 +12,21 @@
 <!ENTITY % sendOptionsDTD SYSTEM "chrome://messenger/locale/preferences/attachmentReminder.dtd">
 %sendOptionsDTD;
 ]>
 
 <prefwindow id="attachmentReminderOptionsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel"
             title="&attachmentReminderDialog.title;"
+            onload="gAttachmentReminderOptionsDialog.init();"
             ondialogaccept="gAttachmentReminderOptionsDialog.saveKeywords();"
             style="width:38em;">
 
-  <prefpane id="attachmentReminderOptionsDialogPane"
-            onpaneload="gAttachmentReminderOptionsDialog.init();">
-
+  <prefpane id="attachmentReminderOptionsDialogPane">
     <script type="application/javascript" src="chrome://messenger/content/preferences/attachmentReminder.js"/>
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <groupbox>
       <label control="keywordList">&attachKeywordText.label;</label>
       <hbox>
         <richlistbox id="keywordList" flex="1" height="250px"
                      ondblclick="gAttachmentReminderOptionsDialog.editKeyword();"/>
--- a/mail/components/preferences/receipts.xul
+++ b/mail/components/preferences/receipts.xul
@@ -10,19 +10,20 @@
 <!DOCTYPE prefwindow [
 <!ENTITY % receiptsDTD SYSTEM "chrome://messenger/locale/preferences/receipts.dtd">
 %receiptsDTD;
 ]>
 
 <prefwindow id="ReturnReceiptsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel"
-            title="&dialog.title;">
+            title="&dialog.title;"
+            onload="enableDisableAllowedReceipts();">
 
-  <prefpane id="ReturnReceiptsDialogPane" onpaneload="enableDisableAllowedReceipts();">
+  <prefpane id="ReturnReceiptsDialogPane">
     <script type="application/javascript" src="chrome://messenger/content/preferences/receipts.js"/>
 
     <preferences id="ReturnReceiptsPreferences">
       <preference id="mail.receipt.request_return_receipt_on" name="mail.receipt.request_return_receipt_on" type="bool"/>
       <preference id="mail.incorporate.return_receipt" name="mail.incorporate.return_receipt" type="int"/>
       <preference id="mail.mdn.report.enabled"     name="mail.mdn.report.enabled" type="bool"/>
       <preference id="mail.mdn.report.not_in_to_cc" name="mail.mdn.report.not_in_to_cc" type="int"/>
       <preference id="mail.mdn.report.outside_domain" name="mail.mdn.report.outside_domain" type="int"/>
--- a/mail/components/preferences/sendoptions.xul
+++ b/mail/components/preferences/sendoptions.xul
@@ -14,19 +14,20 @@
 %sendOptionsDTD;
 ]>
 
 <prefwindow id="SendOptionsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             xmlns:html="http://www.w3.org/1999/xhtml"
             dlgbuttons="accept,cancel"
             style="min-height: 33em;"
-            title="&dialog.title;">
+            title="&dialog.title;"
+            onload="gSendOptionsDialog.init();">
 
-  <prefpane id="SendOptionsDialogPane" onpaneload="gSendOptionsDialog.init();">
+  <prefpane id="SendOptionsDialogPane">
     <script type="application/javascript" src="chrome://messenger/content/preferences/sendoptions.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <preferences id="SendOptionsPreferences">
       <preference id="mailnews.sendformat.auto_downgrade" name="mailnews.sendformat.auto_downgrade" type="bool"/>
       <preference id="mail.default_html_action"      name="mail.default_html_action" type="int"/>
       <preference id="mailnews.html_domains"         name="mailnews.html_domains" type="string"/>