Bug 1617452 - Move the type="child" to <window> instead of <dialog>. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Mon, 24 Feb 2020 12:46:23 +0200
changeset 37421 1274488084757043ccf09e1fcf7ab67adba4c524
parent 37420 2a7bb79c9728de95188518f89c2b83e268e3bdaa
child 37422 f08e737dee014947c1c82cd6578f892db5ff685a
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1617452
Bug 1617452 - Move the type="child" to <window> instead of <dialog>. r=mkmelin
mail/base/content/sanitize.xhtml
mail/components/preferences/attachmentReminder.xhtml
mail/components/preferences/colors.xhtml
mail/components/preferences/dockoptions.xhtml
mail/components/preferences/fonts.xhtml
mail/components/preferences/notifications.xhtml
mail/components/preferences/offline.xhtml
mail/components/preferences/receipts.xhtml
mail/components/preferences/sendoptions.xhtml
--- a/mail/base/content/sanitize.xhtml
+++ b/mail/base/content/sanitize.xhtml
@@ -10,24 +10,25 @@
 
 <!DOCTYPE window [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   <!ENTITY % sanitizeDTD SYSTEM "chrome://messenger/locale/sanitize.dtd">
   %brandDTD;
   %sanitizeDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&sanitizeDialog2.title;"
         noneverythingtitle="&sanitizeDialog2.title;"
         style="width: &dialog.width;"
         onload="gSanitizePromptDialog.init();">
 <dialog id="SanitizeDialog"
-        dlgbuttons="accept,cancel"
-        type="child">
+        dlgbuttons="accept,cancel">
 
   <vbox id="SanitizeDialogPane">
     <stringbundle id="bundleBrowser"
             src="chrome://messenger/locale/messenger.properties"/>
 
     <script src="chrome://messenger/content/sanitize.js"/>
     <script src="chrome://messenger/content/sanitizeDialog.js"/>
 
--- a/mail/components/preferences/attachmentReminder.xhtml
+++ b/mail/components/preferences/attachmentReminder.xhtml
@@ -8,22 +8,23 @@
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % sendOptionsDTD SYSTEM "chrome://messenger/locale/preferences/attachmentReminder.dtd">
 %sendOptionsDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&attachmentReminderDialog.title;"
         onload="gAttachmentReminderOptionsDialog.init();"
         style="width:38em;">
 <dialog id="attachmentReminderOptionsDialog"
-        type="child"
         dlgbuttons="accept,cancel">
 
   <prefpane id="attachmentReminderOptionsDialogPane">
     <script src="chrome://messenger/content/preferences/attachmentReminder.js"/>
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
     <vbox>
       <label control="keywordList">&attachKeywordText.label;</label>
       <hbox>
--- a/mail/components/preferences/colors.xhtml
+++ b/mail/components/preferences/colors.xhtml
@@ -6,26 +6,26 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/preferences/colors.dtd" >
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&colorsDialog.title;"
 #ifdef XP_MACOSX
         style="width: &window.macWidth; !important;">
 #else
         style="width: &window.width; !important;">
 #endif
 <dialog id="ColorsDialog"
-        type="child"
         dlgbuttons="accept,cancel">
   <prefpane id="ColorsDialogPane">
     <hbox>
       <hbox flex="1">
       <html:fieldset>
         <html:legend>&color;</html:legend>
         <hbox align="center">
           <label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
--- a/mail/components/preferences/dockoptions.xhtml
+++ b/mail/components/preferences/dockoptions.xhtml
@@ -4,22 +4,22 @@
    - 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/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/preferences/dockoptions.dtd">
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&dockOptionsDialog.title;"
         style="width: &window.macWidth;">
 <dialog id="DockOptionsDialog"
-        type="child"
         dlgbuttons="accept,cancel">
 
   <prefpane id="DockOptionsDialogPane">
     <hbox orient="vertical">
       <checkbox id="newMailNotificationBounce"
                 label="&bounceSystemDockIcon.label;"
                 preference="mail.biff.animate_dock_icon"
                 accesskey="&bounceSystemDockIcon.accesskey;"/>
--- a/mail/components/preferences/fonts.xhtml
+++ b/mail/components/preferences/fonts.xhtml
@@ -7,24 +7,22 @@
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
 <!ENTITY % fontsDTD SYSTEM "chrome://messenger/locale/preferences/fonts.dtd" >
 %fontsDTD;
 ]>
 
-<window class="prefwindow"
+<window type="child"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&fontsAndEncodingsDialog.title;"
-        persist="lastSelected screenX screenY"
-        role="dialog">
+        persist="lastSelected screenX screenY">
 <dialog id="FontsDialog"
-        type="child"
         buttons="accept,cancel">
 
   <keyset>
     <key data-l10n-id="fonts-window-close" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <vbox id="FontsDialogPane" class="prefpane largeDialogContainer">
 
--- a/mail/components/preferences/notifications.xhtml
+++ b/mail/components/preferences/notifications.xhtml
@@ -8,19 +8,21 @@
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % notificationsDTD SYSTEM "chrome://messenger/locale/preferences/notifications.dtd">
   %notificationsDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&notificationsDialog2.title;">
-<dialog id="NotificationsDialog" type="child"
+<dialog id="NotificationsDialog"
         dlgbuttons="accept,cancel">
 
   <prefpane id="NotificationsDialogPane">
     <description>&alertCustomization.intro;</description>
     <checkbox id="previewText" class="indent" label="&previewText.label;" accesskey="&previewText.accesskey;" preference="mail.biff.alert.show_preview"/>
     <checkbox id="subject" class="indent" label="&subject.label;" accesskey="&subject.accesskey;" preference="mail.biff.alert.show_subject"/>
     <checkbox id="sender"  class="indent" label="&sender.label;" accesskey="&sender.accesskey;" preference="mail.biff.alert.show_sender"/>
 
--- a/mail/components/preferences/offline.xhtml
+++ b/mail/components/preferences/offline.xhtml
@@ -7,21 +7,22 @@
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % offlineDTD SYSTEM "chrome://messenger/locale/preferences/offline.dtd">
   %offlineDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="gOfflineDialog.dialogSetup();"
         title="&offlineDialog.title;">
 <dialog id="OfflineSettingsDialog"
-        type="child"
         dlgbuttons="accept,cancel">
 
   <prefpane id="OfflineSettingsDialogPane">
     <script src="chrome://global/content/preferencesBindings.js"/>
     <script src="chrome://messenger/content/preferences/offline.js"/>
 
     <checkbox label="&checkAutoDetect.label;"
               accesskey="&checkAutoDetect.accesskey;"
--- a/mail/components/preferences/receipts.xhtml
+++ b/mail/components/preferences/receipts.xhtml
@@ -7,21 +7,22 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
 <!ENTITY % receiptsDTD SYSTEM "chrome://messenger/locale/preferences/receipts.dtd">
 %receiptsDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&dialog.title;"
         onload="enableDisableAllowedReceipts();">
 <dialog id="ReturnReceiptsDialog"
-        type="child"
         dlgbuttons="accept,cancel">
 
   <prefpane id="ReturnReceiptsDialogPane">
     <script src="chrome://global/content/preferencesBindings.js"/>
     <script src="chrome://messenger/content/preferences/receipts.js"/>
 
     <vbox id="returnReceiptSettings" align="start">
       <checkbox id="alwaysRequest" label="&requestReceipt.label;"
--- a/mail/components/preferences/sendoptions.xhtml
+++ b/mail/components/preferences/sendoptions.xhtml
@@ -9,22 +9,23 @@
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % sendOptionsDTD SYSTEM "chrome://messenger/locale/preferences/sendoptions.dtd" >
 %sendOptionsDTD;
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window type="child"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="min-height: 33em;"
         title="&dialog.title;"
         onload="gSendOptionsDialog.init();">
-<dialog id="SendOptionsDialog" type="child"
+<dialog id="SendOptionsDialog"
         dlgbuttons="accept,cancel">
 
   <prefpane id="SendOptionsDialogPane">
     <script src="chrome://global/content/preferencesBindings.js"/>
     <script src="chrome://messenger/content/preferences/sendoptions.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>