path: root/www/waterfox/files/patch-bug1401876

commit 09ba71b3a5e9
Author: Scott Wu <scottcwwu@gmail.com>
Date:   Thu Sep 21 15:37:25 2017 +0800

    Bug 1401876 - Part 1: Close datetime picker on popuphidden. r=mconley, a=ritu
    
    MozReview-Commit-ID: FUqbtAftQxh
    
    --HG--
    extra : source : e238860e4943cd1bb4c2c5f7175a36d494f0e91b
---
 toolkit/content/tests/browser/head.js     | 1 +
 toolkit/content/widgets/datetimepopup.xml | 2 +-
 toolkit/modules/DateTimePickerHelper.jsm  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git toolkit/content/widgets/datetimepopup.xml toolkit/content/widgets/datetimepopup.xml
index 7e4e5bcfe4e8..7397e1d310d4 100644
--- toolkit/content/widgets/datetimepopup.xml
+++ toolkit/content/widgets/datetimepopup.xml
@@ -75,7 +75,6 @@
           this.dateTimePopupFrame.removeEventListener("load", this, true);
           this.dateTimePopupFrame.contentDocument.removeEventListener("message", this);
           this.dateTimePopupFrame.setAttribute("src", "");
-          this.hidePopup();
           this.hidden = true;
         ]]></body>
       </method>
@@ -320,6 +319,7 @@
               break;
             }
             case "ClosePopup": {
+              this.hidePopup();
               this.closePicker();
               break;
             }
diff --git toolkit/modules/DateTimePickerHelper.jsm toolkit/modules/DateTimePickerHelper.jsm
index ced4e401815b..38e89bd0d160 100644
--- toolkit/modules/DateTimePickerHelper.jsm
+++ toolkit/modules/DateTimePickerHelper.jsm
@@ -90,6 +90,7 @@ this.DateTimePickerHelper = {
         if (browser) {
           browser.messageManager.sendAsyncMessage("FormDateTime:PickerClosed");
         }
+        this.picker.closePicker();
         this.close();
         break;
       }