diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-29 15:22:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-29 15:22:51 +0200 |
| commit | ede253f1b2edbd10a1df3991438262a4a47059c1 (patch) | |
| tree | 7f7e454c4bc01e1a724188fe68bf625165efc766 /addons/web/static/src | |
| parent | c40236eb16936553ed6df52a4546a5a40fd86809 (diff) | |
| parent | d61873ac4a3ef2e30f06adbf8658d59f3be8b2dd (diff) | |
[MERGE] forward port branch 11.0 up to d61873ac4a3
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 4c8fae324b0..21f88f8abe6 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -2097,7 +2097,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 54ff6642b15..f969a04e570 100644 --- a/addons/web/static/src/js/views/graph/graph_view.js +++ b/addons/web/static/src/js/views/graph/graph_view.js @@ -47,6 +47,9 @@ var GraphView = AbstractView.extend({ this.arch.children.forEach(function (field) { var name = field.attrs.name; + if (name === "id") { + return; + } if (field.attrs.interval) { name += ':' + field.attrs.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}}); |
