From bda320052ac937f5bc17c7da81d84633d72a8370 Mon Sep 17 00:00:00 2001
From: jvm-odoo <jvm@odoo.com>
Date: Thu, 30 Apr 2020 08:09:49 +0000
Subject: [PATCH] [FIX] web: fix can't open date picker on graph views
Issue
- Install CRM
- CRM > Reports > Activities
- Add a custom filter > Created on
- Select the date
You can't, the date picker is not shown
Cause
Actually, the date picker is shown but
very quickly and it is closed by a scroll
event thrown by Chart.js.
Solution
Close the date picker only if the user
scrolls manually.
OPW-2245019
closes odoo/odoo#50434
Signed-off-by: Jason Van Malder (jvm) <jvm@odoo.com>
---
addons/web/static/src/js/widgets/date_picker.js | 6 +++---
addons/web/static/tests/fields/basic_fields_tests.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index db8190e4d2cd..6917e94c330c 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -75,7 +75,7 @@ var DateWidget = Widget.extend({
*/
destroy: function () {
if (this._onScroll) {
- window.removeEventListener('scroll', this._onScroll, true);
+ window.removeEventListener('wheel', this._onScroll, true);
}
this.__libInput++;
this.$el.datetimepicker('destroy');
@@ -263,7 +263,7 @@ var DateWidget = Widget.extend({
this.__isOpen = false;
this.changeDatetime();
if (this._onScroll) {
- window.removeEventListener('scroll', this._onScroll, true);
+ window.removeEventListener('wheel', this._onScroll, true);
}
this.changeDatetime();
},
@@ -287,7 +287,7 @@ var DateWidget = Widget.extend({
self.__libInput--;
}
};
- window.addEventListener('scroll', this._onScroll, true);
+ window.addEventListener('wheel', this._onScroll, true);
},
/**
* @private
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 807b849cc78e..94dd9a40b869 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -3317,7 +3317,7 @@ QUnit.module('basic_fields', {
assert.containsOnce($('body'), '.bootstrap-datetimepicker-widget', "datepicker should be opened");
- form.el.dispatchEvent(new Event('scroll'));
+ form.el.dispatchEvent(new Event('wheel'));
assert.containsNone($('body'), '.bootstrap-datetimepicker-widget', "datepicker should be closed");
form.destroy();
--
GitLab