summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorSébastien Theys <seb@odoo.com>2018-08-21 16:13:29 +0200
committerSébastien Theys <seb@odoo.com>2018-08-22 11:51:30 +0200
commit4310b11df534daecbf3ca49b01bd6fbad42d499f (patch)
treefc4fb1707d7c62f26b17029c6925ba433a666c33 /addons/web/static/src
parent241704536d38f387d076c73c503b36b062a91ff7 (diff)
[FIX] web: compute the correct height for textarea autoresize
The box-sizing property was not correctly taken into account. - content-box is the standard behavior: border and padding are added after the height - border-box needs attention: border and padding must be included into the computed height Task: 1869469 PR: #26430
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/core/dom.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/src/js/core/dom.js b/addons/web/static/src/js/core/dom.js
index 7e3cb6128b9..eaff2185de9 100644
--- a/addons/web/static/src/js/core/dom.js
+++ b/addons/web/static/src/js/core/dom.js
@@ -74,12 +74,12 @@ return {
function resize() {
$fixedTextarea.insertAfter($textarea);
- var heightOffset;
+ var heightOffset = 0;
var style = window.getComputedStyle($textarea[0], null);
- if (style.boxSizing === 'content-box') {
- heightOffset = -(parseFloat(style.paddingTop) + parseFloat(style.paddingBottom));
- } else {
- heightOffset = parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
+ if (style.boxSizing === 'border-box') {
+ var paddingHeight = parseFloat(style.paddingTop) + parseFloat(style.paddingBottom);
+ var borderHeight = parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
+ heightOffset = borderHeight + paddingHeight;
}
$fixedTextarea.width($textarea.width());
$fixedTextarea.val($textarea.val());