diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-05 10:44:17 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-05 10:44:17 +0530 |
| commit | 77dbc558cf2de8bd6013c82e1ae3e84d2e2f6a40 (patch) | |
| tree | cd84be4601dd49817df075722d2e65388f9c1e68 /addons/web/static/src/js/view_list_editable.js | |
| parent | 7184bd91515886ec8c2e4cddd163cba3658be781 (diff) | |
| parent | 74cda3df5bdf6be39358d804ea268401ee677401 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121102111255-wu683od04sr9h8dg
bzr revid: jra@tinyerp.com-20121105051417-pa5spswlxg20xcqx
Diffstat (limited to 'addons/web/static/src/js/view_list_editable.js')
| -rw-r--r-- | addons/web/static/src/js/view_list_editable.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index acc1d781976..021e5549c18 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -252,9 +252,10 @@ openerp.web.list_editable = function (instance) { var position = $cell.position(); field.set_dimensions($cell.outerHeight(), $cell.outerWidth()); - field.$el.css({ - top: position.top, - left: position.left, + field.$el.position({ + my: 'left top', + at: 'left top', + of: $cell }); }, /** @@ -410,15 +411,15 @@ openerp.web.list_editable = function (instance) { }); this.editor.$el.on('keyup keydown', function (e) { - if (!self.editor.is_editing()) { return; } + if (!self.editor.is_editing()) { return true; } var key = _($.ui.keyCode).chain() .map(function (v, k) { return {name: k, code: v}; }) .find(function (o) { return o.code === e.which; }) .value(); - if (!key) { return; } + if (!key) { return true; } var method = e.type + '_' + key.name; - if (!(method in self)) { return; } - self[method](e); + if (!(method in self)) { return true; } + return self[method](e); }); }, /** @@ -446,7 +447,10 @@ openerp.web.list_editable = function (instance) { keyup_ENTER: function () { return this._next(); }, - keyup_ESCAPE: function () { + keydown_ESCAPE: function (e) { + return false; + }, + keyup_ESCAPE: function (e) { return this.cancel_edition(); }, /** |