summaryrefslogtreecommitdiff
path: root/addons/web/static/lib
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-11-29 20:06:16 +0100
committerChristophe Simonis <chs@odoo.com>2018-11-29 20:06:16 +0100
commitce4cc24621bf6430d7d3a2d469b375b59120c200 (patch)
tree3837b5fe41ff88b24136ab53c871bc01f965cab1 /addons/web/static/lib
parent4d7aa97da38e497fef31a06543bfa5d2c8785708 (diff)
parent82a1e1dcc33d7c123e50d3e1aacb5e127f57c521 (diff)
[MERGE] forward port branch 12.0 up to 82a1e1dcc33
Diffstat (limited to 'addons/web/static/lib')
-rw-r--r--addons/web/static/lib/tempusdominus/tempusdominus.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/lib/tempusdominus/tempusdominus.js b/addons/web/static/lib/tempusdominus/tempusdominus.js
index 63daabbd6f7..a5dac48ac3a 100644
--- a/addons/web/static/lib/tempusdominus/tempusdominus.js
+++ b/addons/web/static/lib/tempusdominus/tempusdominus.js
@@ -563,10 +563,10 @@ var DateTimePicker = function ($, moment) {
DateTimePicker.prototype._notifyEvent = function _notifyEvent(e) {
// /!\ ODOO FIX: these next conditions have been modified by odoo
// FIXME should write a test about the tricky case this handles
- if (!e.date && !e.oldDate) {
- return;
- }
if (e.type === DateTimePicker.Event.CHANGE) {
+ if (!e.date && !e.oldDate) {
+ return;
+ }
// check _isUTC flag to ensure that we are not comparing apples and oranges
var bothUTC = e.date && e.oldDate && e.date._isUTC === e.oldDate._isUTC;
if (bothUTC && e.date.isSame(e.oldDate)) {