summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/chrome/systray_menu.js
diff options
context:
space:
mode:
authorVincent Schippefilt <vsc@odoo.com>2019-04-05 07:48:02 +0000
committerVincent Schippefilt <vsc@odoo.com>2019-04-05 10:13:41 +0000
commiteebb0c6152f270cfabb183f79fcf2b2e56918950 (patch)
tree6c5c64874c8e91d2a3a6b5f4c5b154e5cffe3b28 /addons/web/static/src/js/chrome/systray_menu.js
parent6940cfddbc69570143e5dc9ddab21d4061b52dbf (diff)
[FIX] web: corrected the order of icons in systray
Since the merge of JQuery 3, the building of systray icons is non deterministic. After this fix, the menus are loaded correctly in order. Task-ID: 1960741 closes odoo/odoo#32382 Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/chrome/systray_menu.js')
-rw-r--r--addons/web/static/src/js/chrome/systray_menu.js41
1 files changed, 21 insertions, 20 deletions
diff --git a/addons/web/static/src/js/chrome/systray_menu.js b/addons/web/static/src/js/chrome/systray_menu.js
index fd214c0b650..cb292a9b90f 100644
--- a/addons/web/static/src/js/chrome/systray_menu.js
+++ b/addons/web/static/src/js/chrome/systray_menu.js
@@ -1,6 +1,7 @@
odoo.define('web.SystrayMenu', function (require) {
"use strict";
+var dom = require('web.dom');
var Widget = require('web.Widget');
/**
@@ -18,35 +19,35 @@ var SystrayMenu = Widget.extend({
this.widgets = [];
},
/**
+ * Instanciate the items and add them into a temporary fragmenet
* @override
- * @returns {Promise}
*/
- start: function () {
+ willStart: function () {
var self = this;
- self._super.apply(this, arguments);
- self._loadItems();
-
- return new Promise(function (resolve, reject) {
- Promise.all(self.items).then(resolve).guardedCatch(resolve);
+ var proms = [];
+ SystrayMenu.Items = _.sortBy(SystrayMenu.Items, function (item) {
+ return !_.isUndefined(item.prototype.sequence) ? item.prototype.sequence : 50;
});
- },
- //--------------------------------------------------------------------------
- // Private
- //--------------------------------------------------------------------------
+ SystrayMenu.Items.forEach(function (WidgetClass) {
+ var cur_systray_item = new WidgetClass(self);
+ self.widgets.push(cur_systray_item);
+ proms.push(cur_systray_item.appendTo($('<div>')));
+ });
+ return this._super.apply(this, arguments).then(function () {
+ return Promise.all(proms);
+ });
+ },
/**
- * Instantiate items, using the classes located in SystrayMenu.items.
+ * Add the instanciated items, using the object located in this.wisgets
*/
- _loadItems: function () {
+ start: function () {
var self = this;
- SystrayMenu.Items = _.sortBy(SystrayMenu.Items, function (item) {
- return !_.isUndefined(item.prototype.sequence) ? item.prototype.sequence : 50;
- });
- _.each(SystrayMenu.Items, function (WidgetClass) {
- var cur_systray_item = new WidgetClass(self);
- self.widgets.push(cur_systray_item);
- self.items.push(cur_systray_item.prependTo(self.$el));
+ return this._super.apply(this, arguments).then(function () {
+ self.widgets.forEach(function (widget) {
+ dom.prepend(self.$el, widget.$el);
+ });
});
},
});