diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-29 16:45:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-29 16:45:15 +0200 |
| commit | 8bd6a93c74de7aa68b0a85cc6132aa22975462d8 (patch) | |
| tree | af6334a048dd1e2c03f3a937c03feacc5b462efd /addons/web/static/src | |
| parent | 3d6e91789968719c726420554d25b25f81282a55 (diff) | |
| parent | ede253f1b2edbd10a1df3991438262a4a47059c1 (diff) | |
[MERGE] forward port branch saas-11.3 up to ede253f1b2e
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph/graph_view.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/auto_complete.js | 12 |
3 files changed, 15 insertions, 2 deletions
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index f1086f2a2d2..f591af6ddac 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -2308,7 +2308,7 @@ var FieldStatus = AbstractField.extend({ var FieldSelection = AbstractField.extend({ template: 'FieldSelection', specialData: "_fetchSpecialRelation", - supportedFieldTypes: ['selection', 'many2one'], + supportedFieldTypes: ['selection'], events: _.extend({}, AbstractField.prototype.events, { 'change': '_onChange', }), diff --git a/addons/web/static/src/js/views/graph/graph_view.js b/addons/web/static/src/js/views/graph/graph_view.js index a55da16c6da..ca6c5bdf44c 100644 --- a/addons/web/static/src/js/views/graph/graph_view.js +++ b/addons/web/static/src/js/views/graph/graph_view.js @@ -53,6 +53,9 @@ var GraphView = AbstractView.extend({ this.arch.children.forEach(function (field) { var fieldName = field.attrs.name; + if (fieldName === "id") { + return; + } var interval = field.attrs.interval; if (interval) { intervalMapping[fieldName] = interval; diff --git a/addons/web/static/src/js/widgets/auto_complete.js b/addons/web/static/src/js/widgets/auto_complete.js index a25dc0150f5..1821e555331 100644 --- a/addons/web/static/src/js/widgets/auto_complete.js +++ b/addons/web/static/src/js/widgets/auto_complete.js @@ -127,12 +127,22 @@ return Widget.extend({ var $item = self.make_list_item(result).appendTo($list); result.$el = $item; }); + // IE9 doesn't support addEventListener with option { once: true } + this.el.onmousemove = function (ev) { + self.$('li').each(function (index, li) { + li.onmouseenter = self.focus_element.bind(self, $(li)); + }); + var targetFocus = ev.target.tagName === 'LI' ? + ev.target : + ev.target.closest('li'); + self.focus_element($(targetFocus)); + self.el.onmousemove = null; + }; this.show(); }, make_list_item: function (result) { var self = this; var $li = $('<li>') - .hover(function () {self.focus_element($li);}) .mousedown(function (ev) { if (ev.button === 0) { // left button self.select(ev, {item: {facet: result.facet}}); |
