summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-05-04 17:09:51 +0200
committerChristophe Simonis <chs@odoo.com>2016-05-04 17:09:51 +0200
commit0fbc92e0c4c07d61da55d0bbb3cadd55f51dc4d7 (patch)
tree4be569ab0f86370fe9044a9b13d69c858c980de0 /addons/web/static/src/js
parent858188f1a2a2207cf93cc0f2d0d2deb08bb7dbf6 (diff)
parent1e86774207d09c901c61b148c5c0c23a511aa282 (diff)
[MERGE] forward port of branch saas-10 up to 1e86774
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/views/list_view_editable.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index f4a4c695334..02f810e5c66 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -725,13 +725,13 @@ ListView.include(/** @lends instance.web.ListView# */{
keyup_UP: function (e) {
var self = this;
return this._key_move_record(e, 'pred', function (el, cursor) {
- return self._at_start(cursor, el);
+ return self._at_start(cursor, el) && !$(el).is('select,.ui-autocomplete-input');
});
},
keyup_DOWN: function (e) {
var self = this;
return this._key_move_record(e, 'succ', function (el, cursor) {
- return self._at_end(cursor, el);
+ return self._at_end(cursor, el) && !$(el).is('select,.ui-autocomplete-input');
});
},