summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-05-17 16:32:26 +0200
committerChristophe Simonis <chs@odoo.com>2019-05-17 16:32:26 +0200
commitdd90919c1957f70a4ba021724044ac1e08cbe6bd (patch)
tree9948b1e22ae1a87755186565e51973539273a60e /addons/web/static/src
parent88de76a2c23b8cb2b46d95d63ce31f1eeff8eef3 (diff)
parentd785adba6c09b0773bdd874182f450ba2ebe7c6d (diff)
[MERGE] forward port branch saas-12.1 up to d785adba6c0
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/chrome/abstract_web_client.js6
-rw-r--r--addons/web/static/src/js/tools/test_menus.js6
-rw-r--r--addons/web/static/src/js/widgets/date_picker.js7
3 files changed, 17 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js
index 2516b0a7230..2a8e8151560 100644
--- a/addons/web/static/src/js/chrome/abstract_web_client.js
+++ b/addons/web/static/src/js/chrome/abstract_web_client.js
@@ -491,7 +491,11 @@ var AbstractWebClient = Widget.extend(ServiceProviderMixin, KeyboardNavigationMi
new RainbowMan(data).appendTo(this.$el);
} else {
// For instance keep title blank, as we don't have title in data
- this.notification_manager.notify('', data.message, true);
+ this.call('notification', 'notify', {
+ title: "",
+ message: data.message,
+ sticky: false
+ });
}
} else {
throw new Error('Unknown effect type: ' + type);
diff --git a/addons/web/static/src/js/tools/test_menus.js b/addons/web/static/src/js/tools/test_menus.js
index 4e31b2d4467..040901f549e 100644
--- a/addons/web/static/src/js/tools/test_menus.js
+++ b/addons/web/static/src/js/tools/test_menus.js
@@ -44,8 +44,12 @@
}
}
- // Main function that starts orchestration of tests
function clickEverywhere(){
+ setTimeout(_clickEverywhere, 1000);
+ }
+
+ // Main function that starts orchestration of tests
+ function _clickEverywhere(){
console.log("Starting ClickEverywhere test");
var startTime = performance.now();
createWebClientHooks();
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)