Bug 1608610 - Integrate messenger-overlay-messageWindow.xhtml. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Mon, 13 Jan 2020 12:40:05 -0500
changeset 38103 1fa6810ac522dd414cddf26937113a14599674c3
parent 38102 8d524b01c605ad4acba95b5924842fbe60e06c94
child 38104 8f7bf0b238cbd5d9d35a326443fd3d7e4661032b
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersFallen
bugs1608610
Bug 1608610 - Integrate messenger-overlay-messageWindow.xhtml. r=Fallen
calendar/lightning/content/messenger-overlay-messageWindow.xhtml
calendar/lightning/jar.mn
mail/base/content/messageWindow.xhtml
deleted file mode 100644
--- a/calendar/lightning/content/messenger-overlay-messageWindow.xhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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://lightning/skin/lightning.css" type="text/css"?>
-
-<overlay id="messsenger-overlay-messageWindow"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-    <script src="chrome://calendar/content/calendar-statusbar.js"/>
-    <script src="chrome://calendar/content/calendar-item-editing.js"/>
-</overlay>
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -4,17 +4,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 lightning.jar:
 % override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
 % override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
 % overlay chrome://messenger/content/messenger.xhtml chrome://lightning/content/lightning-item-panel.xhtml
 % overlay chrome://messenger/content/messenger.xhtml chrome://lightning/content/messenger-overlay-sidebar.xhtml
 % overlay chrome://messenger/content/messageWindow.xhtml chrome://lightning/content/imip-bar-overlay.xhtml
-% overlay chrome://messenger/content/messageWindow.xhtml chrome://lightning/content/messenger-overlay-messageWindow.xhtml
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xhtml chrome://lightning/content/imip-bar-overlay.xhtml
 % overlay chrome://communicator/content/pref/preferences.xhtml chrome://lightning/content/suite-overlay-preferences.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay about:addons chrome://lightning/content/suite-overlay-addons.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://mozapps/content/extensions/extensions.xhtml chrome://lightning/content/suite-overlay-addons.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://messenger/content/preferences/preferences.xhtml chrome://lightning/content/messenger-overlay-preferences.xhtml
 % overlay about:preferences chrome://lightning/content/messenger-overlay-preferences.xhtml
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xhtml chrome://lightning/content/suite-overlay-sidebar.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % override chrome://lightning-common/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
@@ -26,17 +25,16 @@ lightning.jar:
     content/lightning-calendar-creation.js                 (content/lightning-calendar-creation.js)
     content/lightning-calendar-properties.js               (content/lightning-calendar-properties.js)
     content/lightning-invitation.xhtml                     (content/lightning-invitation.xhtml)
 *   content/lightning-item-panel.xhtml                     (content/lightning-item-panel.xhtml)
     content/lightning-item-panel.js                        (content/lightning-item-panel.js)
     content/lightning-item-iframe.xhtml                    (content/lightning-item-iframe.xhtml)
     content/lightning-item-iframe.js                       (content/lightning-item-iframe.js)
     content/lightning-utils.js                             (content/lightning-utils.js)
-    content/messenger-overlay-messageWindow.xhtml          (content/messenger-overlay-messageWindow.xhtml)
     content/messenger-overlay-sidebar.js                   (content/messenger-overlay-sidebar.js)
     content/messenger-overlay-sidebar.xhtml                (content/messenger-overlay-sidebar.xhtml)
     content/messenger-overlay-preferences.js               (content/messenger-overlay-preferences.js)
 *   content/messenger-overlay-preferences.xhtml            (content/messenger-overlay-preferences.xhtml)
 #ifdef MOZ_SUITE
     content/suite-overlay-addons.xhtml                     (content/suite-overlay-addons.xhtml)
     content/suite-overlay-preferences.xhtml                (content/suite-overlay-preferences.xhtml)
     content/suite-overlay-sidebar.js                       (content/suite-overlay-sidebar.js)
--- a/mail/base/content/messageWindow.xhtml
+++ b/mail/base/content/messageWindow.xhtml
@@ -9,16 +9,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/editContactPanel.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/customizableui/panelUI.css" type="text/css"?>
+<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
 %msgHdrViewOverlayDTD;
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
@@ -124,16 +125,18 @@
   <script src="chrome://messenger/content/customizableui/panelUI.js"/>
   <script src="chrome://messenger/content/chat/toolbarbutton-badge-button.js"/>
   <script src="chrome://messenger/content/messenger-customization.js"/>
 #ifdef XP_MACOSX
   <script src="chrome://global/content/macWindowMenu.js"/>
 #endif
   <script src="chrome://messenger/content/newmailaccount/uriListener.js"/>
   <script src="chrome://messenger/content/customizable-toolbar.js"/>
+  <script src="chrome://calendar/content/calendar-statusbar.js"/>
+  <script src="chrome://calendar/content/calendar-item-editing.js"/>
 
   <commandset id="mailCommands">
 #include mainCommandSet.inc.xhtml
     <commandset id="mailSearchMenuItems"/>
     <commandset id="attachmentCommands">
       <command id="cmd_openAllAttachments"
                oncommand="goDoCommand('cmd_openAllAttachments');"
                disabled="true"/>