diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-09 16:57:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-09 16:57:29 +0100 |
| commit | 0210a6298d9dd39ddb15a1e0b8f49f7821cd460f (patch) | |
| tree | bd3a3cee4abb9b03ac48f115d6e513be1dbc273e /phpBB/assets | |
| parent | fffbbbdcc49f99b141b610ac94f5e8486de25aa8 (diff) | |
| parent | ad5d4f6bc3a061452d415ce0ee5929e33566f29b (diff) | |
| download | forums-0210a6298d9dd39ddb15a1e0b8f49f7821cd460f.tar forums-0210a6298d9dd39ddb15a1e0b8f49f7821cd460f.tar.gz forums-0210a6298d9dd39ddb15a1e0b8f49f7821cd460f.tar.bz2 forums-0210a6298d9dd39ddb15a1e0b8f49f7821cd460f.tar.xz forums-0210a6298d9dd39ddb15a1e0b8f49f7821cd460f.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 91f5521c7a..5844537fc8 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1032,7 +1032,7 @@ phpbb.resizeTextArea = function($items, options) { function autoResize(item) { function setHeight(height) { - height += parseInt($item.css('height'), 10) - $item.height(); + height += parseInt($item.css('height'), 10) - $item.innerHeight(); $item .css({ height: height + 'px', resize: 'none' }) .addClass('auto-resized'); @@ -1051,7 +1051,7 @@ phpbb.resizeTextArea = function($items, options) { configuration.maxHeight ), $item = $(item), - height = parseInt($item.height(), 10), + height = parseInt($item.innerHeight(), 10), scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0; if (height < 0) { |