diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-27 18:30:46 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-27 18:30:46 +0200 |
| commit | 6d85a9a4b912cb98986cef07976ea04f52dcc5f1 (patch) | |
| tree | 46a7cebd216649d9739baba10cdc57708e4a8683 /addons/web/static/src | |
| parent | 436daf0c4f22bd6cb8d761d2eaae7a9ae764a724 (diff) | |
| parent | d744923b6351e63d91ac248a3fd783c619c84e40 (diff) | |
[MERGE] forward port of branch 8.0 up to d744923
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list_editable.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c31595dc0c0..0d7df4688c8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2967,6 +2967,10 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc } } }, + focus: function() { + var input = !this.get("effective_readonly") && this.$cleditor + return input ? input.focus() : false; + }, render_value: function() { if (! this.get("effective_readonly")) { this.$textarea.val(this.get('value') || ''); diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 150ca20a110..d424fd7b075 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -301,7 +301,7 @@ var $cell = $(cell); field.set_dimensions($cell.outerHeight(), $cell.outerWidth()); - field.$el.position({ + field.$el.css({top: 0, left: 0}).position({ my: 'left top', at: 'left top', of: $cell |