Bug 1608610 - Inline the DTD/CSS/JS files from messenger-overlay-sidebar. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Tue, 14 Jan 2020 11:38:31 -0500
changeset 38109 873146a4a36cad063e72cdb17fba63021953f94f
parent 38108 4656ef92d6aabef50c2a0529ffaceddf9c72c257
child 38110 05e3a9199721408f7675235f58fb58d017dcec0f
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersFallen
bugs1608610
Bug 1608610 - Inline the DTD/CSS/JS files from messenger-overlay-sidebar. r=Fallen
calendar/lightning/content/messenger-overlay-sidebar.xhtml
mail/base/content/messenger.xhtml
--- a/calendar/lightning/content/messenger-overlay-sidebar.xhtml
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xhtml
@@ -1,129 +1,19 @@
 <?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/. -->
 
-<!DOCTYPE overlay
-[
-  <!ENTITY % dtd1 SYSTEM "chrome://lightning/locale/lightning.dtd" > %dtd1;
-  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %dtd2;
-  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd3;
-  <!ENTITY % dtd4 SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd" > %dtd4;
-  <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" > %messengerDTD;
-  <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %eventDialogDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" > %globalDTD;
-  <!ENTITY % calendarGlobalDTD SYSTEM "chrome://calendar/locale/global.dtd" > %calendarGlobalDTD;
-  <!ENTITY % mailOverlayDTD SYSTEM "chrome://messenger/locale/mailOverlay.dtd"> %mailOverlayDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
-]>
-
-<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-event-dialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/content/calendar-event-dialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-unifinder.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-task-tree.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/calendar-alarms.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://lightning/skin/lightning-toolbar.css" type="text/css"?>
-
 <overlay id="ltnSidebarOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script src="chrome://lightning/content/lightning-utils.js"/>
-  <script src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
-
-  <script src="chrome://calendar/content/calendar-day-label.js"/>
-
-  <!-- NEEDED FOR MULTIPLE CALENDAR SUPPORT AND TODAY PANE -->
-  <script src="chrome://calendar/content/calendar-management.js"/>
-
-  <!-- NEEDED FOR CLIPBOARD SUPPORT -->
-  <script src="chrome://calendar/content/calendar-clipboard.js"/>
-
-  <!-- NEEDED FOR IMPORT / EXPORT SUPPORT -->
-  <script src="chrome://calendar/content/import-export.js"/>
-
-  <!-- NEEDED FOR PUBLICATION SUPPORT -->
-  <script src="chrome://calendar/content/publish.js"/>
-
-  <script src="chrome://calendar/content/calendar-item-editing.js"/>
-  <script src="chrome://calendar/content/calendar-chrome-startup.js"/>
-  <script src="chrome://calendar/content/mouseoverPreviews.js"/>
-  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
-
-  <script src="chrome://calendar/content/calendar-views-utils.js"/>
-  <script src="chrome://calendar/content/calendar-base-view.js"/>
-  <script src="chrome://calendar/content/calendar-month-base-view.js"/>
-  <script src="chrome://calendar/content/widgets/calendar-dnd-widgets.js"/>
-  <script src="chrome://calendar/content/calendar-multiday-base-view.js"/>
-  <script src="chrome://calendar/content/calendar-views.js"/>
-  <script src="chrome://calendar/content/calendar-editable-item.js"/>
-  <script src="chrome://calendar/content/calendar-month-view.js"/>
-  <script src="chrome://calendar/content/calendar-multiday-view.js"/>
-  <script src="chrome://calendar/content/calendar-event-column.js"/>
-
-  <script src="chrome://calendar/content/calendar-creation.js"/>
-  <script src="chrome://calendar/content/calendar-dnd-listener.js"/>
-  <script src="chrome://calendar/content/calendar-statusbar.js"/>
-  <script src="chrome://calendar/content/widgets/calendar-minimonth.js"/>
-  <script src="chrome://global/content/nsDragAndDrop.js"/>
-  <script src="chrome://calendar/content/widgets/calendar-modebox.js"/>
-
-  <!-- NEEDED FOR TASK VIEW/LIST SUPPORT -->
-  <script src="chrome://calendar/content/calendar-task-editing.js"/>
-
-  <script src="chrome://calendar/content/calendar-extract.js"/>
-
-  <script src="chrome://calendar/content/calendar-invitations-manager.js"/>
-
-  <!-- NEEDED FOR EVENT/TASK IN A TAB -->
-  <script src="chrome://lightning/content/lightning-item-panel.js"/>
-
-  <script src="chrome://calendar/content/calendar-command-controller.js"/>
-
-  <!-- NEEDED FOR TODAY PANE -->
-  <script src="chrome://calendar/content/agenda-listbox.js"/>
-  <script src="chrome://calendar/content/today-pane.js"/>
-  <script src="chrome://calendar/content/agenda-listbox-utils.js"/>
-
-  <!-- NEEDED FOR EVENTS VIEW (UNIFINDER) -->
-  <script src="chrome://calendar/content/calendar-unifinder.js"/>
-
-  <!-- NEEDED FOR TODAY PANE AND TASKS VIEW -->
-  <script src="chrome://calendar/content/calFilter.js"/>
-  <script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
-
-  <!-- NEEDED FOR TASK VIEW -->
-  <script src="chrome://calendar/content/calendar-task-tree-view.js"/>
-  <script src="chrome://calendar/content/calendar-task-tree.js"/>
-  <script src="chrome://calendar/content/calendar-task-view.js"/>
-  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script src="chrome://calendar/content/calendar-item-bindings.js"/>
-  <script src="chrome://calendar/content/calendar-menus.js"/>
-
-  <!-- NEEDED FOR CALENDAR VIEWS -->
-  <script src="chrome://calendar/content/calendar-event-gripbar.js"/>
-
   <window id="messengerWindow">
     <commandset id="calendar_commands"
                 commandupdater="true"
                 events="calendar_commands"
                 oncommandupdate="calendarController.updateCommands()">
       <command id="agenda_delete_event_command" oncommand="agendaListbox.deleteSelectedItem(false);"/>
       <command id="agenda_edit_event_command" oncommand="agendaListbox.editSelectedItem(event);"/>
       <command id="switch2calendar"
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -19,16 +19,37 @@
 <?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://messenger/skin/input-fields.css" type="text/css"?>
 
+<!-- Calendar CSS -->
+<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/skin/calendar-event-dialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/content/calendar-event-dialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/skin/calendar-unifinder.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/skin/calendar-task-tree.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/calendar-alarms.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://lightning/skin/lightning-toolbar.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;
 <!ENTITY % chatDTD SYSTEM "chrome://messenger/locale/chat.dtd">
@@ -56,26 +77,34 @@
 <!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
 %msgReadSMIMEDTD;
 #ifdef MOZ_OPENPGP
 <!ENTITY % bondOpenPGPDTD SYSTEM "chrome://openpgp/content/strings/bond.dtd">
 %bondOpenPGPDTD;
 #endif
 <!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
 %msgViewPickerDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
-%globalDTD;
+<!ENTITY % calendarGlobalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+%calendarGlobalDTD;
 <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
 %calendarDTD;
 <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
 %eventDialogDTD;
 <!ENTITY % toolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd">
 %toolbarDTD;
 <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
 %lightningDTD;
+<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" >
+%calendarMenuOverlayDTD;
+<!ENTITY % lightningToolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd" >
+%lightningToolbarDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
+%globalDTD;
+<!ENTITY % mailOverlayDTD SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
+%mailOverlayDTD;
 ]>
 
 <!--
   - The 'what you think of when you think of thunderbird' window;
   -  3-pane view inside of tabs.
   -->
 <window id="messengerWindow"
         xmlns:html="http://www.w3.org/1999/xhtml"
@@ -186,19 +215,91 @@
 #endif
 
 <!-- move needed functions into a single js file -->
 <script src="chrome://messenger/content/threadPane.js"/>
 
 <!-- calendar imip bar -->
 <script src="chrome://lightning/content/lightning-utils.js"/>
 <script src="chrome://lightning/content/imip-bar.js"/>
+<!-- calendar-management.js also needed for multiple calendar support and today pane -->
 <script src="chrome://calendar/content/calendar-management.js"/>
 <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
+<script src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
+
+<script src="chrome://calendar/content/calendar-day-label.js"/>
+
+<!-- NEEDED FOR CLIPBOARD SUPPORT -->
+<script src="chrome://calendar/content/calendar-clipboard.js"/>
+
+<!-- NEEDED FOR IMPORT / EXPORT SUPPORT -->
+<script src="chrome://calendar/content/import-export.js"/>
+
+<!-- NEEDED FOR PUBLICATION SUPPORT -->
+<script src="chrome://calendar/content/publish.js"/>
+
+<script src="chrome://calendar/content/calendar-item-editing.js"/>
+<script src="chrome://calendar/content/calendar-chrome-startup.js"/>
+<script src="chrome://calendar/content/mouseoverPreviews.js"/>
+
+<script src="chrome://calendar/content/calendar-views-utils.js"/>
+<script src="chrome://calendar/content/calendar-base-view.js"/>
+<script src="chrome://calendar/content/calendar-month-base-view.js"/>
+<script src="chrome://calendar/content/widgets/calendar-dnd-widgets.js"/>
+<script src="chrome://calendar/content/calendar-multiday-base-view.js"/>
+<script src="chrome://calendar/content/calendar-views.js"/>
+<script src="chrome://calendar/content/calendar-editable-item.js"/>
+<script src="chrome://calendar/content/calendar-month-view.js"/>
+<script src="chrome://calendar/content/calendar-multiday-view.js"/>
+<script src="chrome://calendar/content/calendar-event-column.js"/>
+
+<script src="chrome://calendar/content/calendar-creation.js"/>
+<script src="chrome://calendar/content/calendar-dnd-listener.js"/>
+<script src="chrome://calendar/content/calendar-statusbar.js"/>
+<script src="chrome://calendar/content/widgets/calendar-minimonth.js"/>
+<script src="chrome://global/content/nsDragAndDrop.js"/>
+<script src="chrome://calendar/content/widgets/calendar-modebox.js"/>
+
+<!-- NEEDED FOR TASK VIEW/LIST SUPPORT -->
+<script src="chrome://calendar/content/calendar-task-editing.js"/>
+
+<script src="chrome://calendar/content/calendar-extract.js"/>
+
+<script src="chrome://calendar/content/calendar-invitations-manager.js"/>
+
+<!-- NEEDED FOR EVENT/TASK IN A TAB -->
+<script src="chrome://lightning/content/lightning-item-panel.js"/>
+
+<script src="chrome://calendar/content/calendar-command-controller.js"/>
+
+<!-- NEEDED FOR TODAY PANE -->
+<script src="chrome://calendar/content/agenda-listbox.js"/>
+<script src="chrome://calendar/content/today-pane.js"/>
+<script src="chrome://calendar/content/agenda-listbox-utils.js"/>
+
+<!-- NEEDED FOR EVENTS VIEW (UNIFINDER) -->
+<script src="chrome://calendar/content/calendar-unifinder.js"/>
+
+<!-- NEEDED FOR TODAY PANE AND TASKS VIEW -->
+<script src="chrome://calendar/content/calFilter.js"/>
+<script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
+
+<!-- NEEDED FOR TASK VIEW -->
+<script src="chrome://calendar/content/calendar-task-tree-view.js"/>
+<script src="chrome://calendar/content/calendar-task-tree.js"/>
+<script src="chrome://calendar/content/calendar-task-view.js"/>
+<script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+<script src="chrome://calendar/content/calApplicationUtils.js"/>
+<script src="chrome://calendar/content/calendar-item-bindings.js"/>
+<script src="chrome://calendar/content/calendar-menus.js"/>
+
+<!-- NEEDED FOR CALENDAR VIEWS -->
+<script src="chrome://calendar/content/calendar-event-gripbar.js"/>
+
 <commandset id="mailCommands">
 #include mainCommandSet.inc.xhtml
   <commandset id="mailSearchMenuItems"/>
   <commandset id="globalEditMenuItems"
               commandupdater="true"
               events="create-menu-edit"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
   <commandset id="selectEditMenuItems"