diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-06 12:27:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-06 12:27:51 +0200 |
| commit | a97037c6d442f186a798322a6eff586a3a118ef3 (patch) | |
| tree | 930cf70045eb8ec16323ccab3c4f6023aedb83bb /addons/web/static/src/js/widgets/date_picker.js | |
| parent | e5fc29564532e3c11a48b8c98a69675580d2c572 (diff) | |
| parent | 78b3b650b0ddcb5fb53fda505e9e61510a1364fc (diff) | |
[MERGE] forward port branch saas-12.2 up to 78b3b650b0d
Diffstat (limited to 'addons/web/static/src/js/widgets/date_picker.js')
| -rw-r--r-- | addons/web/static/src/js/widgets/date_picker.js | 11 |
1 files changed, 11 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 75c52ce81a7..3aeb1d2f6fb 100644 --- a/addons/web/static/src/js/widgets/date_picker.js +++ b/addons/web/static/src/js/widgets/date_picker.js @@ -258,6 +258,17 @@ var DateWidget = Widget.extend({ */ _onKeydown: function (ev) { if (ev.which === $.ui.keyCode.ESCAPE) { + this.__libInput++; + this.$el.datetimepicker('hide'); + this.__libInput--; + } + }, + /** + * @private + * @param {KeyEvent} ev + */ + _onKeydown: function (ev) { + if (ev.which === $.ui.keyCode.ESCAPE) { if (this.__isOpen) { // we don't want any other effects than closing the datepicker, // like leaving the edition of a row in editable list view |