summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2016-01-15 16:31:07 +0100
committerGéry Debongnie <ged@odoo.com>2016-01-18 09:45:58 +0100
commit992222a24a352bbdcc34b1ef82021d524cef65c2 (patch)
treed4114a5c0395178a1d17bf3fdf49faf8790ae80c /addons/web/static/src/js/framework
parentfb7064bf3fa1260aada23985ab7f7768f24785a6 (diff)
[FIX] web: fix autosize small bugs
- better width handling - disable css vertical resize - correctly copy css classes to the 'shadow' textarea
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/utils.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js
index 38953138da9..a0ab37a7dfb 100644
--- a/addons/web/static/src/js/framework/utils.js
+++ b/addons/web/static/src/js/framework/utils.js
@@ -475,10 +475,16 @@ function autoresize ($textarea, options) {
top: -10000,
left: -10000,
});
- $fixed_text_area.addClass($fixed_text_area[0].classList);
+ $fixed_text_area.addClass($textarea[0].className);
$fixed_text_area.insertAfter($textarea);
}
+ var style = window.getComputedStyle($textarea[0], null);
+ if (style.resize === 'vertical') {
+ $textarea[0].style.resize = 'none';
+ } else if (style.resize === 'both') {
+ $textarea[0].style.resize = 'horizontal';
+ }
resize();
if ($textarea.__auto_resized) {
return;
@@ -499,7 +505,7 @@ function autoresize ($textarea, options) {
} else {
heightOffset = parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
}
- $fixed_text_area.width($textarea.outerWidth());
+ $fixed_text_area.width($textarea.width());
$fixed_text_area.val($textarea.val());
var height = $fixed_text_area[0].scrollHeight;
$textarea.css({height: Math.max(height + heightOffset, min_height)});