odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] fixes for non-direct IME 

bzr revid: xmo@openerp.com-20131218152626-kexq1wudvjwnh962
This commit is contained in:
Xavier Morel 2013-12-18 16:26:26 +01:00
parent fe5383f0e2 b4c121db71
commit 1b76c66930
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/view_form.js
View File

@ -3978,7 +3978,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
}
this.cancel_edition();
},
keyup_ENTER: function () {
keypress_ENTER: function () {
// blurring caused by hitting the [Return] key, should skip the
// autosave-on-blur and let the handler for [Return] do its thing (save
// the current row *anyway*, then create a new one/edit the next one)

4
addons/web/static/src/js/view_list_editable.js
View File

@ -459,7 +459,7 @@ openerp.web.list_editable = function (instance) {
});
});
this.editor.$el.on('keyup keydown', function (e) {
this.editor.$el.on('keyup keypress keydown', function (e) {
if (!self.editor.is_editing()) { return true; }
var key = _($.ui.keyCode).chain()
.map(function (v, k) { return {name: k, code: v}; })
@ -494,7 +494,7 @@ openerp.web.list_editable = function (instance) {
return self.start_edition(record, options);
});
},
keyup_ENTER: function () {
keypress_ENTER: function () {
return this._next();
},
keydown_ESCAPE: function (e) {