Bug 1429232 - SM: Restore the datetimepicker bindings/styles after their removal in bug 1428849, part 1: Add suite-specific paths in datetimepicker.xml. r=Paenglab
authorstefanh@inbox.com
Sun, 14 Jan 2018 17:14:52 +0100
changeset 30038 428b9f503c287d0faced0b5b2361e8e509bbaab9
parent 30037 1dd846f3e167ed1f8ddf4463239daaed86a00e38
child 30039 2ef0cd0692a20c0c7f82e7e9f359b0e8a7561d9e
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)
reviewersPaenglab
bugs1429232, 1428849
Bug 1429232 - SM: Restore the datetimepicker bindings/styles after their removal in bug 1428849, part 1: Add suite-specific paths in datetimepicker.xml. r=Paenglab
common/bindings/datetimepicker.xml
mail/base/jar.mn
--- a/common/bindings/datetimepicker.xml
+++ b/common/bindings/datetimepicker.xml
@@ -17,17 +17,21 @@
 
   <binding id="datetimepicker-base"
            extends="chrome://global/content/bindings/general.xml#basecontrol">
 
     <resources>
       <stylesheet src="chrome://global/content/textbox.css"/>
       <stylesheet src="chrome://global/skin/textbox.css"/>
       <stylesheet src="chrome://global/skin/dropmarker.css"/>
+#ifdef MOZ_SUITE
+      <stylesheet src="chrome://communicator/skin/datetimepicker.css"/>
+#else
       <stylesheet src="chrome://messenger/skin/datetimepicker.css"/>
+#endif
     </resources>
 
     <content align="center">
       <xul:hbox class="datetimepicker-input-box" align="center"
                 xbl:inherits="context,disabled,readonly">
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
                       size="2" maxlength="2"
@@ -206,18 +210,21 @@
       <handler event="change">
         this._setValueOnChange(event.originalTarget);
       </handler>
     </handlers>
 
   </binding>
 
   <binding id="datepicker"
+#ifdef MOZ_SUITE
+           extends="chrome://communicator/content/bindings/datetimepicker.xml#datetimepicker-base">
+#else
            extends="chrome://messenger/content/datetimepicker.xml#datetimepicker-base">
-
+#endif
     <implementation>
       <field name="yearLeadingZero">false</field>
       <field name="monthLeadingZero">true</field>
       <field name="dateLeadingZero">true</field>
 
       <field name="yearField"/>
       <field name="monthField"/>
       <field name="dateField"/>
@@ -489,18 +496,21 @@
           ]]>
         </body>
       </method>
     </implementation>
 
   </binding>
 
   <binding id="datepicker-grid"
+#ifdef MOZ_SUITE
+           extends="chrome://communicator/content/bindings/datetimepicker.xml#datepicker">
+#else
            extends="chrome://messenger/content/datetimepicker.xml#datepicker">
-
+#endif
     <content>
       <vbox class="datepicker-mainbox"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
         <hbox class="datepicker-monthbox" align="center">
           <button class="datepicker-previous datepicker-button" type="repeat"
                   xbl:inherits="disabled"
                   oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(-1);"/>
           <spacer flex="1"/>
@@ -876,17 +886,21 @@
       <handler event="keypress" keycode="VK_PAGE_UP" preventdefault="true"
                action="this._increaseOrDecreaseMonth(-1);"/>
       <handler event="keypress" keycode="VK_PAGE_DOWN" preventdefault="true"
                action="this._increaseOrDecreaseMonth(1);"/>
     </handlers>
   </binding>
 
   <binding id="datepicker-popup" display="xul:menu"
+#ifdef MOZ_SUITE
+           extends="chrome://communicator/content/bindings/datetimepicker.xml#datepicker">
+#else
            extends="chrome://messenger/content/datetimepicker.xml#datepicker">
+#endif
     <content align="center">
       <xul:hbox class="textbox-input-box datetimepicker-input-box" align="center"
                 allowevents="true" xbl:inherits="context,disabled,readonly">
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
                       size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -35,17 +35,17 @@ messenger.jar:
     content/messenger/hiddenWindow.js               (content/hiddenWindow.js)
     content/messenger/msgHdrViewOverlay.js          (content/msgHdrViewOverlay.js)
     content/messenger/msgHdrViewOverlay.xul         (content/msgHdrViewOverlay.xul)
     content/messenger/msgViewNavigation.js          (content/msgViewNavigation.js)
     content/messenger/mailWidgets.xml               (content/mailWidgets.xml)
     content/messenger/customizeToolbar.css          (../../common/src/customizeToolbar.css)
     content/messenger/customizeToolbar.js           (../../common/src/customizeToolbar.js)
     content/messenger/customizeToolbar.xul          (../../common/src/customizeToolbar.xul)
-    content/messenger/datetimepicker.xml            (../../common/bindings/datetimepicker.xml)
+*   content/messenger/datetimepicker.xml            (../../common/bindings/datetimepicker.xml)
     content/messenger/generalBindings.xml           (../../common/bindings/generalBindings.xml)
     content/messenger/toolbar.xml                   (../../common/bindings/toolbar.xml)
 *   content/messenger/bindings.css                  (content/bindings.css)
     content/messenger/nsDragAndDrop.js              (content/nsDragAndDrop.js)
     content/messenger/editContactOverlay.js         (content/editContactOverlay.js)
 *   content/messenger/editContactOverlay.xul        (content/editContactOverlay.xul)
     content/messenger/msgMail3PaneWindow.js         (content/msgMail3PaneWindow.js)
     content/messenger/mail3PaneWindowCommands.js    (content/mail3PaneWindowCommands.js)