diff options
| author | Olivier Dony <odo@openerp.com> | 2017-05-16 10:06:36 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-05-16 10:06:36 +0200 |
| commit | 0570033ae7c5b4e0efa4a1ee9fd90dcb9675f890 (patch) | |
| tree | 1268154f499c304840bb9e50ee4b9cd514fd9657 /addons/web_editor/static/src/js/backend.js | |
| parent | 4e8e546ed73f1b7d758dddb2f3773a1b0360467b (diff) | |
| parent | 2c4512c263b0f46e4679c4bd0ee669f365a5aa92 (diff) | |
[MERGE] Forward-port 9.0 up to 2c4512c263b0f46e4679c4bd0ee669f365a5aa92
Diffstat (limited to 'addons/web_editor/static/src/js/backend.js')
| -rw-r--r-- | addons/web_editor/static/src/js/backend.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js index c6c35cff1d0..7ed4dd24f10 100644 --- a/addons/web_editor/static/src/js/backend.js +++ b/addons/web_editor/static/src/js/backend.js @@ -138,7 +138,7 @@ var FieldTextHtmlSimple = widget.extend({ } }, resize: function() { - this.$('iframe').css('height', '0px').css('height', Math.max(30, Math.min(this.$content[0] ? this.$content[0].scrollHeight : 0, 500)) + 'px'); + this.$('> iframe.o_readonly').css('height', '0px').css('height', Math.max(30, Math.min(this.$content[0] ? this.$content[0].scrollHeight : 0, 500)) + 'px'); }, render_value: function () { var value = this.get('value'); |