summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorYannick Tivisse <yti@odoo.com>2016-02-08 10:18:42 +0100
committerYannick Tivisse <yti@odoo.com>2016-02-08 11:08:34 +0100
commit46e925aa9f7bdbff3fb062e26eb49025bbc0c570 (patch)
treee15fbd7904402f626f473cd7725ec6f89ccde0be /addons/web/static
parent09659cca30a98dd9a522c53918e389e0d8f667eb (diff)
[FIX] web: Load SystrayMenu even if a systray's deferred is rejected
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/widgets/systray_menu.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/widgets/systray_menu.js b/addons/web/static/src/js/widgets/systray_menu.js
index b969663e70b..131954de15f 100644
--- a/addons/web/static/src/js/widgets/systray_menu.js
+++ b/addons/web/static/src/js/widgets/systray_menu.js
@@ -17,9 +17,10 @@ var SystrayMenu = Widget.extend({
var self = this;
self._super.apply(this, arguments);
self.load_items();
- return $.when.apply($, self.items).done(function () {
+ $.when.apply($, self.items).always(function () {
self.load.resolve();
});
+ return self.load;
},
load_items: function() {
var self = this;