Bug 1429232 - SM: Restore the datetimepicker bindings/styles after their removal in bug 1428849, part 2: Use the c-c bindings and adjust location of datetimepicker.dtd. r=IanN
authorstefanh@inbox.com
Sun, 21 Jan 2018 22:00:44 +0100
changeset 30039 2ef0cd0692a20c0c7f82e7e9f359b0e8a7561d9e
parent 30038 428b9f503c287d0faced0b5b2361e8e509bbaab9
child 30040 26ee9005950789a7a3963618470f9c76c404f016
push id2108
push userclokep@gmail.com
push dateMon, 22 Jan 2018 17:53:55 +0000
treeherdercomm-beta@c44930d8ad9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs1429232, 1428849
Bug 1429232 - SM: Restore the datetimepicker bindings/styles after their removal in bug 1428849, part 2: Use the c-c bindings and adjust location of datetimepicker.dtd. r=IanN
common/bindings/datetimepicker.xml
suite/common/communicator.css
suite/common/jar.mn
suite/locales/en-US/chrome/common/datetimepicker.dtd
suite/locales/en-US/chrome/mailnews/datetimepicker.dtd
suite/locales/jar.mn
suite/themes/classic/communicator/datetimepicker.css
suite/themes/classic/jar.mn
suite/themes/classic/mac/communicator/datetimepicker.css
suite/themes/modern/communicator/datetimepicker.css
suite/themes/modern/global/datetimepicker.css
suite/themes/modern/jar.mn
--- a/common/bindings/datetimepicker.xml
+++ b/common/bindings/datetimepicker.xml
@@ -1,16 +1,21 @@
 <?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 bindings [
-  <!ENTITY % datetimepickerDTD SYSTEM "chrome://messenger/locale/datetimepicker.dtd">
+<!ENTITY % datetimepickerDTD SYSTEM
+#ifdef MOZ_SUITE
+  "chrome://communicator/locale/datetimepicker.dtd">
+#else
+  "chrome://messenger/locale/datetimepicker.dtd">
+#endif
   %datetimepickerDTD;
 ]>
 
 <bindings id="timepickerBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
--- a/suite/common/communicator.css
+++ b/suite/common/communicator.css
@@ -295,8 +295,21 @@ toolbar[type="menubar"][autohide="true"]
 
 toolbar[type="menubar"][autohide="true"][inactive="true"]
 {
   min-height: 0px !important;
   height: 0px !important;
   -moz-appearance: none !important;
   border-style: none !important;
 }
+
+/******* datepicker *******/
+datepicker {
+  -moz-binding: url('chrome://communicator/content/bindings/datetimepicker.xml#datepicker');
+}
+
+datepicker[type="popup"] {
+  -moz-binding: url("chrome://communicator/content/bindings/datetimepicker.xml#datepicker-popup");
+}
+
+datepicker[type="grid"] {
+  -moz-binding: url("chrome://communicator/content/bindings/datetimepicker.xml#datepicker-grid");
+}
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -103,16 +103,17 @@ comm.jar:
 #else
 #ifdef XP_WIN
    content/communicator/platformCommunicatorOverlay.xul             (win/platformCommunicatorOverlay.xul)
 #else
    content/communicator/platformCommunicatorOverlay.xul             (unix/platformCommunicatorOverlay.xul)
 #endif
 #endif
    content/communicator/autocomplete.css                            (autocomplete/autocomplete.css)
+*  content/communicator/bindings/datetimepicker.xml                 (../../common/bindings/datetimepicker.xml)
    content/communicator/bindings/findbar.xml                        (bindings/findbar.xml)
    content/communicator/bindings/general.xml                        (bindings/general.xml)
    content/communicator/bindings/generalBindings.xml                (../../common/bindings/generalBindings.xml)
    content/communicator/bindings/notification.xml                   (bindings/notification.xml)
 *  content/communicator/bindings/preferences.xml                    (../../common/bindings/preferences.xml)
    content/communicator/bindings/toolbar.xml                        (bindings/toolbar.xml)
 *  content/communicator/bindings/prefwindow.xml                     (bindings/prefwindow.xml)
    content/communicator/bookmarks/bm-panel.js                       (bookmarks/bm-panel.js)
rename from suite/locales/en-US/chrome/mailnews/datetimepicker.dtd
rename to suite/locales/en-US/chrome/common/datetimepicker.dtd
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -26,16 +26,17 @@
   locale/@AB_CD@/branding/brand.dtd                                         (%chrome/branding/brand.dtd)
   locale/@AB_CD@/branding/brand.properties                                  (%chrome/branding/brand.properties)
   locale/@AB_CD@/branding/aboutRights.dtd                                   (%chrome/branding/aboutRights.dtd)
   locale/@AB_CD@/branding/aboutRights.properties                            (%chrome/branding/aboutRights.properties)
   locale/@AB_CD@/communicator/askViewZoom.dtd                               (%chrome/common/askViewZoom.dtd)
   locale/@AB_CD@/communicator/certError.dtd                                 (%chrome/common/certError.dtd)
   locale/@AB_CD@/communicator/contentAreaCommands.dtd                       (%chrome/common/contentAreaCommands.dtd)
   locale/@AB_CD@/communicator/contentAreaCommands.properties                (%chrome/common/contentAreaCommands.properties)
+  locale/@AB_CD@/communicator/datetimepicker.dtd                            (%chrome/common/datetimepicker.dtd)
   locale/@AB_CD@/communicator/defaultClientDialog.dtd                       (%chrome/common/defaultClientDialog.dtd)
   locale/@AB_CD@/communicator/feeds/subscribe.dtd                           (%chrome/common/feeds/subscribe.dtd)
   locale/@AB_CD@/communicator/feeds/subscribe.properties                    (%chrome/common/feeds/subscribe.properties)
   locale/@AB_CD@/communicator/gopherAddon.dtd                               (%chrome/common/gopherAddon.dtd)
   locale/@AB_CD@/communicator/notification.dtd                              (%chrome/common/notification.dtd)
   locale/@AB_CD@/communicator/notification.properties                       (%chrome/common/notification.properties)
   locale/@AB_CD@/communicator/openLocation.dtd                              (%chrome/common/openLocation.dtd)
   locale/@AB_CD@/communicator/openLocation.properties                       (%chrome/common/openLocation.properties)
@@ -258,17 +259,16 @@
   locale/@AB_CD@/messenger/am-archiveoptions.dtd                            (%chrome/mailnews/pref/am-archiveoptions.dtd)
   locale/@AB_CD@/messenger/removeAccount.dtd                                (%chrome/mailnews/pref/removeAccount.dtd)
   locale/@AB_CD@/messenger/removeAccount.properties                         (%chrome/mailnews/pref/removeAccount.properties)
   locale/@AB_CD@/messenger/appleMailImportMsgs.properties                   (%chrome/mailnews/appleMailImportMsgs.properties)
   locale/@AB_CD@/messenger/beckyImportMsgs.properties                       (%chrome/mailnews/beckyImportMsgs.properties)
   locale/@AB_CD@/messenger/charsetTitles.properties                         (%chrome/mailnews/charsetTitles.properties)
   locale/@AB_CD@/messenger/custom.properties                                (%chrome/mailnews/custom.properties)
   locale/@AB_CD@/messenger/CustomHeaders.dtd                                (%chrome/mailnews/CustomHeaders.dtd)
-  locale/@AB_CD@/messenger/datetimepicker.dtd                               (%chrome/mailnews/datetimepicker.dtd)
   locale/@AB_CD@/messenger/downloadheaders.dtd                              (%chrome/mailnews/downloadheaders.dtd)
   locale/@AB_CD@/messenger/fieldMapImport.dtd                               (%chrome/mailnews/fieldMapImport.dtd)
   locale/@AB_CD@/messenger/filter.properties                                (%chrome/mailnews/filter.properties)
   locale/@AB_CD@/messenger/FilterEditor.dtd                                 (%chrome/mailnews/FilterEditor.dtd)
   locale/@AB_CD@/messenger/FilterListDialog.dtd                             (%chrome/mailnews/FilterListDialog.dtd)
   locale/@AB_CD@/messenger/folderpane.dtd                                   (%chrome/mailnews/folderpane.dtd)
   locale/@AB_CD@/messenger/folderProps.dtd                                  (%chrome/mailnews/folderProps.dtd)
   locale/@AB_CD@/messenger/folderWidgets.properties                         (%chrome/mailnews/folderWidgets.properties)
copy from mail/themes/windows/mail/datetimepicker.css
copy to suite/themes/classic/communicator/datetimepicker.css
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -14,16 +14,17 @@ classic.jar:
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
 #ifdef XP_MACOSX
   skin/classic/communicator/aboutPrivateBrowsing.css                    (mac/communicator/aboutPrivateBrowsing.css)
   skin/classic/communicator/aboutSessionRestore.css                     (mac/communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (mac/communicator/button.css)
   skin/classic/communicator/communicator.css                            (mac/communicator/communicator.css)
   skin/classic/communicator/config.css                                  (mac/communicator/config.css)
+  skin/classic/communicator/datetimepicker.css                          (mac/communicator/datetimepicker.css)
   skin/classic/communicator/preferences.css                             (mac/communicator/preferences.css)
   skin/classic/communicator/toolbar.css                                 (mac/communicator/toolbar.css)
   skin/classic/communicator/viewSourceOverlay.css                       (mac/communicator/viewSourceOverlay.css)
   skin/classic/communicator/bookmarks/bookmarks.css                     (mac/communicator/bookmarks/bookmarks.css)
   skin/classic/communicator/bookmarks/bookmarksManager.css              (mac/communicator/bookmarks/bookmarksManager.css)
   skin/classic/communicator/bookmarks/bookmarksMenu.png                 (mac/communicator/bookmarks/bookmarksMenu.png)
   skin/classic/communicator/bookmarks/bookmarksToolbar.css              (mac/communicator/bookmarks/bookmarksToolbar.css)
   skin/classic/communicator/bookmarks/bookmarksToolbar.png              (mac/communicator/bookmarks/bookmarksToolbar.png)
@@ -59,16 +60,17 @@ classic.jar:
   skin/classic/communicator/icons/warning-24.png                        (mac/communicator/icons/warning-24.png)
   skin/classic/communicator/toolbar/toolbar-gradient22.png              (mac/communicator/toolbar/toolbar-gradient22.png)
   skin/classic/communicator/toolbar/toolbar-gradient34.png              (mac/communicator/toolbar/toolbar-gradient34.png)
 #else
   skin/classic/communicator/aboutPrivateBrowsing.css                    (communicator/aboutPrivateBrowsing.css)
   skin/classic/communicator/aboutSessionRestore.css                     (communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (communicator/button.css)
   skin/classic/communicator/config.css                                  (communicator/config.css)
+  skin/classic/communicator/datetimepicker.css                          (communicator/datetimepicker.css)
 #ifdef MOZ_WIDGET_GTK
   skin/classic/communicator/communicator.css                            (linux/communicator/communicator.css)
   skin/classic/communicator/preferences.css                             (linux/communicator/preferences.css)
   skin/classic/communicator/scrollbars.css                              (linux/communicator/scrollbars.css)
 #else
   skin/classic/communicator/communicator.css                            (communicator/communicator.css)
   skin/classic/communicator/preferences.css                             (communicator/preferences.css)
 #endif
copy from mail/themes/osx/mail/datetimepicker.css
copy to suite/themes/classic/mac/communicator/datetimepicker.css
rename from suite/themes/modern/global/datetimepicker.css
rename to suite/themes/modern/communicator/datetimepicker.css
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -15,16 +15,17 @@ modern.jar:
 % style chrome://global/content/customizeToolbar.xul chrome://navigator/skin/navigator.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
   skin/modern/communicator/brand.css                               (communicator/brand.css)
   skin/modern/communicator/blockedSite.css                         (communicator/blockedSite.css)
   skin/modern/communicator/certError.css                           (communicator/certError.css)
+  skin/modern/communicator/datetimepicker.css                      (communicator/datetimepicker.css)
   skin/modern/communicator/prefpanels.css                          (communicator/prefpanels.css)
   skin/modern/communicator/preferences.css                         (communicator/preferences.css)
   skin/modern/communicator/tasksOverlay.css                        (communicator/tasksOverlay.css)
   skin/modern/communicator/button.css                              (communicator/button.css)
   skin/modern/communicator/toolbar.css                             (communicator/toolbar.css)
   skin/modern/communicator/dialogs.css                             (communicator/dialogs.css)
   skin/modern/communicator/smileys.css                             (communicator/smileys.css)
   skin/modern/communicator/communicator.css                        (communicator/communicator.css)
@@ -195,17 +196,16 @@ modern.jar:
   skin/modern/global/aboutSupport.css                              (global/aboutSupport.css)
   skin/modern/global/appPicker.css                                 (global/appPicker.css)
   skin/modern/global/autocomplete.css                              (global/autocomplete.css)
   skin/modern/global/button.css                                    (global/button.css)
   skin/modern/global/checkbox.css                                  (global/checkbox.css)
   skin/modern/global/colorpicker.css                               (global/colorpicker.css)
   skin/modern/global/config.css                                    (global/config.css)
   skin/modern/global/customizeToolbar.css                          (global/customizeToolbar.css)
-  skin/modern/global/datetimepicker.css                            (global/datetimepicker.css)
   skin/modern/global/dialog.css                                    (global/dialog.css)
   skin/modern/global/dropmarker.css                                (global/dropmarker.css)
   skin/modern/global/filefield.css                                 (global/filefield.css)
   skin/modern/global/filepicker.css                                (global/filepicker.css)
   skin/modern/global/findBar.css                                   (global/findBar.css)
   skin/modern/global/global.css                                    (global/global.css)
   skin/modern/global/groupbox.css                                  (global/groupbox.css)
   skin/modern/global/listbox.css                                   (global/listbox.css)