summaryrefslogtreecommitdiff
path: root/toolkit/content
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-31 06:58:52 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-31 06:58:52 +0200
commitde16d196679e3deaf8797abcc05db5cf0ead6ae8 (patch)
treeb2d0ed916ab6c774949fd86d783fa75b4f687a33 /toolkit/content
parent7e0d05ea58eee63d0647a0bbd4de662fcebc3bf2 (diff)
downloaduxp-de16d196679e3deaf8797abcc05db5cf0ead6ae8.tar.gz
Bug 1401876 - (Part 1) Close datetime picker on popuphidden
Diffstat (limited to 'toolkit/content')
-rw-r--r--toolkit/content/tests/browser/head.js1
-rw-r--r--toolkit/content/widgets/datetimepopup.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/toolkit/content/tests/browser/head.js b/toolkit/content/tests/browser/head.js
index e3ef195382..399b63e340 100644
--- a/toolkit/content/tests/browser/head.js
+++ b/toolkit/content/tests/browser/head.js
@@ -99,6 +99,7 @@ class DateTimeTestHelper {
let pickerClosePromise = new Promise(resolve => {
this.panel.addEventListener("popuphidden", resolve, {once: true});
});
+ this.panel.hidePopup();
this.panel.closePicker();
await pickerClosePromise;
}
diff --git a/toolkit/content/widgets/datetimepopup.xml b/toolkit/content/widgets/datetimepopup.xml
index 1cb9617eaa..b4335e1ced 100644
--- a/toolkit/content/widgets/datetimepopup.xml
+++ b/toolkit/content/widgets/datetimepopup.xml
@@ -70,7 +70,6 @@
this.dateTimePopupFrame.removeEventListener("load", this, true);
this.dateTimePopupFrame.contentDocument.removeEventListener("message", this, false);
this.dateTimePopupFrame.setAttribute("src", "");
- this.hidePopup();
this.hidden = true;
]]></body>
</method>
@@ -302,6 +301,7 @@
break;
}
case "ClosePopup": {
+ this.hidePopup();
this.closePicker();
break;
}