Backed out changeset 68db819d0e77 for landing with the wrong bug number: Bug 1399842 and not bug 1399483. a=backout
authorJorg K <jorgk@jorgk.com>
Fri, 15 Sep 2017 20:45:57 +0200
changeset 22141 cbe0e3a04543ea69a83d597ff93a572145a0a408
parent 22140 3704436e2afb3ed774419dfc6682c99b4eaaddd1
child 22142 95ed66b5bdec30a9e2e733c4b2048ef16bc0293f
push id13515
push usermozilla@jorgk.com
push dateFri, 15 Sep 2017 18:49:06 +0000
treeherdercomm-central@95ed66b5bdec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1399842, 1399483
backs out68db819d0e77d97ddf657c1837f1f60e84a960de
Backed out changeset 68db819d0e77 for landing with the wrong bug number: Bug 1399842 and not bug 1399483. a=backout
calendar/base/content/calendar-menus.xml
calendar/resources/content/datetimepickers/datetimepickers.xml
--- a/calendar/base/content/calendar-menus.xml
+++ b/calendar/base/content/calendar-menus.xml
@@ -14,17 +14,17 @@
     <implementation>
       <field name="mType">null</field>;
       <field name="mPopupHandler">null</field>
       <field name="mParentMenuPopup">null</field>
 
       <constructor><![CDATA[
         Components.utils.import("resource://calendar/modules/calUtils.jsm");
 
-        this.mPopupHandler = () => { this.changeMenuByPropertyName(); };
+        this.mPopupHandler = () => { this.schangeMenuByPropertyName(); };
         this.mParentMenuPopup = cal.getParentNodeOrThis(this, "menupopup");
         this.mParentMenuPopup.addEventListener("popupshowing", this.mPopupHandler, true);
       ]]></constructor>
 
       <destructor><![CDATA[
         this.mParentMenuPopup.removeEventListener("popupshowing", this.mPopupHandler, true);
       ]]></destructor>
 
--- a/calendar/resources/content/datetimepickers/datetimepickers.xml
+++ b/calendar/resources/content/datetimepickers/datetimepickers.xml
@@ -1454,17 +1454,16 @@
   <binding id="datetimepicker-base" extends="chrome://global/content/bindings/general.xml#basecontrol"
            inherits="value,onchange">
     <resources>
       <stylesheet src="chrome://lightning-common/skin/datetimepickers.css"/>
     </resources>
     <implementation>
       <constructor><![CDATA[
         Components.utils.import("resource://calendar/modules/calUtils.jsm");
-        Components.utils.import("resource://gre/modules/Services.jsm");
 
         this.kTimeFormatObject = { timeStyle: "short" };
         this.initDateFormat();
         this.initTimeFormat();
       ]]></constructor>
 
       <property name="value"
                 onget="return this.mValue"