diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-09 16:57:25 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-09 16:57:25 +0100 |
| commit | ad5d4f6bc3a061452d415ce0ee5929e33566f29b (patch) | |
| tree | 2260a82051a57b652b0f1b2ce7a41d0d176f048b /phpBB | |
| parent | 663ee34f66d6ded7eb3c5cc81d1d1df32a31966f (diff) | |
| parent | 147f92971399ef79c421565de927435e7770ee84 (diff) | |
| download | forums-ad5d4f6bc3a061452d415ce0ee5929e33566f29b.tar forums-ad5d4f6bc3a061452d415ce0ee5929e33566f29b.tar.gz forums-ad5d4f6bc3a061452d415ce0ee5929e33566f29b.tar.bz2 forums-ad5d4f6bc3a061452d415ce0ee5929e33566f29b.tar.xz forums-ad5d4f6bc3a061452d415ce0ee5929e33566f29b.zip | |
Merge pull request #4174 from cyberalien/ticket/14467
[ticket/14467] Fix height calculation in autoResize
Diffstat (limited to 'phpBB')
| -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 228230ff71..4efebcacd1 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1029,7 +1029,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'); @@ -1048,7 +1048,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) { |