mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2016-02-09 16:57:29 +01:00
parent fffbbbdcc4 ad5d4f6bc3
commit 0210a6298d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/assets/javascript/core.js
View File

@@ -1032,7 +1032,7 @@ phpbb.resizeTextArea = function($items, options) {
function autoResize(item) { function autoResize(item) {
function setHeight(height) { function setHeight(height) {
height += parseInt($item.css('height'), 10) - $item.height(); height += parseInt($item.css('height'), 10) - $item.innerHeight();
$item $item
.css({ height: height + 'px', resize: 'none' }) .css({ height: height + 'px', resize: 'none' })
.addClass('auto-resized'); .addClass('auto-resized');
@@ -1051,7 +1051,7 @@ phpbb.resizeTextArea = function($items, options) {
configuration.maxHeight configuration.maxHeight
), ),
$item = $(item), $item = $(item),
height = parseInt($item.height(), 10), height = parseInt($item.innerHeight(), 10),
scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0; scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0;
if (height < 0) { if (height < 0) {