summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/widgets
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-05-17 15:50:59 +0200
committerChristophe Simonis <chs@odoo.com>2019-05-17 15:50:59 +0200
commitd785adba6c09b0773bdd874182f450ba2ebe7c6d (patch)
tree5189f5dc30c84515eda62c4d6a512f552ae8f900 /addons/web/static/src/js/widgets
parent8968a620105e2e79f2aa9d8db36b5408b89e92ee (diff)
parentc545783b95b15f65a9798003b614f75685dc434e (diff)
[MERGE] forward port branch 12.0 up to c545783b95b
Diffstat (limited to 'addons/web/static/src/js/widgets')
-rw-r--r--addons/web/static/src/js/widgets/date_picker.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index 57c935905e5..df9601b3a04 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -13,6 +13,7 @@ var DateWidget = Widget.extend({
type_of_date: "date",
events: {
'change.datetimepicker': 'changeDatetime',
+ 'error.datetimepicker': 'errorDatetime',
'change .o_datepicker_input': 'changeDatetime',
'input input': '_onInput',
'keydown': '_onKeydown',
@@ -104,6 +105,12 @@ var DateWidget = Widget.extend({
}
},
/**
+ * Library clears the wrong date format so just ignore error
+ */
+ errorDatetime: function (e) {
+ return false;
+ },
+ /**
* Focuses the datepicker input. This function must be called in order to
* prevent 'input' events triggered by the lib to bubble up, and to cause
* unwanted effects (like triggering 'field_changed' events)