From 1cbd27ae55596fe63a143c657900f4542b4136c9 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Sat, 31 Mar 2018 06:58:05 +0200
Subject: [PATCH] Bug 1390794 - Use 'norolluponanchor' to avoid closing the
 picker when the anchored input box is clicked

---
 browser/base/content/browser.xul        | 6 ++++--
 toolkit/content/widgets/datetimebox.xml | 9 ---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index e8567eb5c2..24bc2ee9c6 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -155,13 +155,15 @@
            level="parent"
            overflowpadding="30" />
 
+    <!-- for date/time picker. consumeoutsideclicks is set to never, so that
+         clicks on the anchored input box are never consumed. -->
     <panel id="DateTimePickerPanel"
            type="arrow"
            hidden="true"
            orient="vertical"
            noautofocus="true"
-           noautohide="true"
-           consumeoutsideclicks="false"
+           norolluponanchor="true"
+           consumeoutsideclicks="never"
            level="parent"
            tabspecific="true">
       <iframe id="dateTimePopupFrame"/>
diff --git a/toolkit/content/widgets/datetimebox.xml b/toolkit/content/widgets/datetimebox.xml
index c45124ef74..3a011cac15 100644
--- a/toolkit/content/widgets/datetimebox.xml
+++ b/toolkit/content/widgets/datetimebox.xml
@@ -1076,9 +1076,6 @@
         // includes padding area).
         this.mInputElement.addEventListener("click", this,
                                             { mozSystemGroup: true });
-        // This is to close the picker when input element blurs.
-        this.mInputElement.addEventListener("blur", this,
-                                            { mozSystemGroup: true });
       ]]>
       </constructor>
 
@@ -1093,8 +1090,6 @@
         });
         this.mInputElement.removeEventListener("click", this,
                                                { mozSystemGroup: true });
-        this.mInputElement.removeEventListener("blur", this,
-                                               { mozSystemGroup: true });
 
         this.mInputElement = null;
       ]]>
@@ -1350,10 +1345,6 @@
           this.log("onBlur originalTarget: " + aEvent.originalTarget +
             " target: " + aEvent.target);
 
-          if (aEvent.target == this.mInputElement && this.mIsPickerOpen) {
-            this.mInputElement.closeDateTimePicker();
-          }
-
           let target = aEvent.originalTarget;
           target.setAttribute("typeBuffer", "");
           this.setInputValueFromFields();