Bug 1556582 - Restore context menus that got lost in bug 1532595. r=jorgk
authorJorg K <jorgk@jorgk.com>
Tue, 04 Jun 2019 01:11:30 +0200
changeset 35766 72186adac207b27578a212a09fb4da7a235d97df
parent 35765 f4628616dd10a3b267b6c2c9540b7492ab64f6fa
child 35767 653cffcb9c305b8a3db751210cc84c991b9298c8
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersjorgk
bugs1556582, 1532595
Bug 1556582 - Restore context menus that got lost in bug 1532595. r=jorgk
calendar/base/content/dialogs/calendar-error-prompt.xul
calendar/base/content/dialogs/calendar-summary-dialog.xul
calendar/lightning/content/lightning-item-iframe.xul
editor/ui/dialogs/content/EdInsSrc.xul
editor/ui/dialogs/content/EdInsertMath.xul
mail/base/content/messenger.xul
mail/components/addrbook/content/abCard.inc.xul
mail/components/preferences/connection.xul
mailnews/addrbook/prefs/content/pref-directory-add.xul
mailnews/base/prefs/content/am-identity-edit.xul
mailnews/base/prefs/content/am-main.xul
mailnews/extensions/smime/content/certpicker.js
mailnews/extensions/smime/content/certpicker.xul
--- a/calendar/base/content/dialogs/calendar-error-prompt.xul
+++ b/calendar/base/content/dialogs/calendar-error-prompt.xul
@@ -1,32 +1,34 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/global.css" type="text/css"?>
 
-<!DOCTYPE dialog 
+<!DOCTYPE dialog
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 
 <dialog id="calendar-error-prompt"
         title="&calendar.error.title;"
         windowtype="Calendar:ErrorPrompt"
         buttons="accept"
         onload="loadErrorPrompt()"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="500"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
+    <script src="chrome://global/content/globalOverlay.js"/>
+    <script src="chrome://global/content/editMenuOverlay.js"/>
     <script><![CDATA[
         function loadErrorPrompt() {
             var args = window.arguments[0].QueryInterface(Ci.nsIDialogParamBlock);
             document.getElementById("general-text").value = args.GetString(0);
             document.getElementById("error-code").value = args.GetString(1);
             document.getElementById("error-description").value = args.GetString(2);
             this.sizeToContent();
         }
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xul
@@ -32,16 +32,18 @@
         onload="onLoad()"
         onunload="onUnload()"
         onresize="rearrangeAttendees();"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://calendar/content/calendar-summary-dialog.js"/>
   <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script src="chrome://calendar/content/calendar-item-editing.js"/>
   <script src="chrome://calendar/content/calApplicationUtils.js"/>
   <script src="chrome://calendar/content/calendar-item-bindings.js"/>
   <script src="chrome://messenger/content/customElements.js"/>
 
--- a/calendar/lightning/content/lightning-item-iframe.xul
+++ b/calendar/lightning/content/lightning-item-iframe.xul
@@ -39,16 +39,17 @@
       xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- JavaScript includes -->
   <script src="chrome://lightning/content/lightning-item-iframe.js"/>
   <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script src="chrome://calendar/content/calApplicationUtils.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://global/content/printUtils.js"/>
   <script src="chrome://calendar/content/calendar-statusbar.js"/>
   <script src="chrome://messenger/content/customElements.js"/>
   <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <commandset id="">
     <command id="cmd_recurrence"
              oncommand="editRepeat();"/>
--- a/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/editor/ui/dialogs/content/EdInsSrc.xul
@@ -12,16 +12,18 @@
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     buttonlabelaccept="&insertButton.label;"
     buttonaccesskeyaccept="&insertButton.accesskey;">
 
   <!-- Methods common to all editor dialogs -->
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://editor/content/editorUtilities.js"/>
   <script src="chrome://editor/content/EdDialogCommon.js"/>
   <script src="chrome://editor/content/EdInsSrc.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label id="srcMessage" value="&sourceEditField.label;"/>
   <vbox flex="1" style="width: 30em; height: 20em;">
--- a/editor/ui/dialogs/content/EdInsertMath.xul
+++ b/editor/ui/dialogs/content/EdInsertMath.xul
@@ -12,16 +12,18 @@
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttonlabelaccept="&insertButton.label;"
         buttonaccesskeyaccept="&insertButton.accesskey;">
 
   <!-- Methods common to all editor dialogs -->
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://editor/content/editorUtilities.js"/>
   <script src="chrome://editor/content/EdDialogCommon.js"/>
   <script src="chrome://editor/content/EdInsertMath.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label id="srcMessage" value="&sourceEditField.label;"/>
   <html:textarea id="input" rows="5" oninput="updateMath();"
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -95,16 +95,17 @@
   <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
 </stringbundleset>
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
 </linkset>
 
 <script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
 <script src="chrome://messenger/content/msgViewNavigation.js"/>
 <script src="chrome://messenger/content/mailWindow.js"/>
 <script src="chrome://messenger/content/selectionsummaries.js"/>
 <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script src="chrome://messenger/content/specialTabs.js"/>
 <!-- accountProvisionerTab.js relies on code from specialTabs.js, and so much be loaded after it. -->
 <script src="chrome://messenger/content/newmailaccount/accountProvisionerTab.js"/>
--- a/mail/components/addrbook/content/abCard.inc.xul
+++ b/mail/components/addrbook/content/abCard.inc.xul
@@ -1,12 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
 <vbox id="editcard">
   <tabbox>
     <tabs id="abTabs">
       <tab id="contactTabButton" label="&Contact.tab;"
            accesskey="&Contact.accesskey;"/>
       <tab id="homeTabButton" label="&Home.tab;" accesskey="&Home.accesskey;"/>
       <tab id="workTabButton" label="&Work.tab;" accesskey="&Work.accesskey;"/>
       <tab id="otherTabButton" label="&Other.tab;" accesskey="&Other.accesskey;"/>
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -22,16 +22,18 @@
 #else
         style="width: &window.width; !important;">
 #endif
 
   <linkset>
     <html:link rel="localization" href="messenger/preferences/connection.ftl"/>
   </linkset>
 
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://global/content/preferencesBindings.js"/>
   <script src="chrome://messenger/content/preferences/connection.js"/>
 
   <groupbox>
     <label><html:h2>&proxyTitle.label;</html:h2></label>
 
     <radiogroup id="networkProxyType" preference="network.proxy.type"
                 onsyncfrompreference="return gConnectionsDialog.readProxyType();">
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xul
@@ -10,16 +10,18 @@
 <dialog id="addDirectory"
         style="width: &newDirectoryWidth;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         onunload="onUnload();"
         buttons="accept,cancel">
 
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_replication" src="chrome://messenger/locale/addressbook/replicationProgress.properties"/>
 
   <keyset id="keyset"/>
   <vbox id="editDirectory">
 
     <tabbox style="margin:5px">
--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@@ -26,16 +26,18 @@
         onload="onLoadIdentityProperties();"
         style="&identityDialog.style;">
 
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_messenger"
                 src="chrome://messenger/locale/messenger.properties"/>
 
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/am-prefs.js"/>
   <script src="chrome://messenger/content/am-identity-edit.js"/>
   <script src="chrome://messenger/content/amUtils.js"/>
   <script src="chrome://messenger/content/am-copies.js"/>
   <script src="chrome://messenger/content/am-addressing.js"/>
   <script src="chrome://messenger/content/am-smime.js"/>
   <script>
   <![CDATA[
--- a/mailnews/base/prefs/content/am-main.xul
+++ b/mailnews/base/prefs/content/am-main.xul
@@ -11,16 +11,18 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml"
       onload="parent.onPanelLoaded('am-main.xul');">
 
   <vbox flex="1" style="overflow: auto;">
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
+    <script src="chrome://global/content/globalOverlay.js"/>
+    <script src="chrome://global/content/editMenuOverlay.js"/>
     <script src="chrome://messenger/content/am-identity-edit.js"/>
     <script src="chrome://messenger/content/am-main.js"/>
     <script src="chrome://messenger/content/am-prefs.js"/>
     <script src="chrome://messenger/content/amUtils.js"/>
 
     <hbox id="am-main-title" class="dialogheader">
       <label class="dialogheader-title" defaultTitle="&accountTitle.label;"/>
     </hbox>
--- a/mailnews/extensions/smime/content/certpicker.js
+++ b/mailnews/extensions/smime/content/certpicker.js
@@ -23,17 +23,17 @@ function onLoad() {
     selIndex = 0;
   }
 
   for (let i = 0; i < itemCount; i++) {
     let menuItemNode = document.createXULElement("menuitem");
     let nick = dialogParams.GetString(i);
     menuItemNode.setAttribute("value", i);
     menuItemNode.setAttribute("label", nick); // This is displayed.
-    selectElement.firstChild.appendChild(menuItemNode);
+    selectElement.menupopup.appendChild(menuItemNode);
 
     if (selIndex == i) {
       selectElement.selectedItem = menuItemNode;
     }
   }
 
   dialogParams.SetInt(0, 0); // Set cancel return value.
   setDetails();
--- a/mailnews/extensions/smime/content/certpicker.xul
+++ b/mailnews/extensions/smime/content/certpicker.xul
@@ -12,16 +12,18 @@
 
 <dialog id="certPicker" title="&certPicker.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   style="width: 50em;"
   buttons="accept,cancel"
   onload="onLoad();">
 
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
 <script src="chrome://messenger/content/certpicker.js"/>
 
   <hbox align="center">
     <label id="pickerInfo" value="&certPicker.info;"/>
     <!-- The items in this menulist must never be sorted,
          but remain in the order filled by the application
     -->
     <menulist id="nicknames" oncommand="onCertSelected();">