diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-20 11:12:55 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-20 11:12:55 -0700 |
| commit | e08db41d0d19e991d3b0434e382ef1ffbd9f2ee9 (patch) | |
| tree | 4a674524dd14a82970bffdb77f747075485809ba /phpBB/assets/javascript | |
| parent | 3b39a44b0079e5eb703db1c70ced2ee9b991503b (diff) | |
| parent | ff10f1ab6aef3cddcc1bd754453881c37e4b976f (diff) | |
| download | forums-e08db41d0d19e991d3b0434e382ef1ffbd9f2ee9.tar forums-e08db41d0d19e991d3b0434e382ef1ffbd9f2ee9.tar.gz forums-e08db41d0d19e991d3b0434e382ef1ffbd9f2ee9.tar.bz2 forums-e08db41d0d19e991d3b0434e382ef1ffbd9f2ee9.tar.xz forums-e08db41d0d19e991d3b0434e382ef1ffbd9f2ee9.zip | |
Merge pull request #1719 from cyberalien/ticket/11552
Responsive design for prosilver
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 0ad5c1d6e7..ab0891e70c 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -624,8 +624,7 @@ phpbb.resizeTextArea = function(items, options) { function resetAutoResize(item) { var $item = $(item); - if ($item.hasClass('auto-resized')) - { + if ($item.hasClass('auto-resized')) { $(item).css({height: '', resize: ''}).removeClass('auto-resized'); configuration.resetCallback.call(item, $item); } @@ -635,14 +634,14 @@ phpbb.resizeTextArea = function(items, options) { { function setHeight(height) { + height += parseInt($item.css('height')) - $item.height(); $item.css({height: height + 'px', resize: 'none'}).addClass('auto-resized'); configuration.resizeCallback.call(item, $item); } var windowHeight = $(window).height(); - if (windowHeight < configuration.minWindowHeight) - { + if (windowHeight < configuration.minWindowHeight) { resetAutoResize(item); return; } @@ -652,12 +651,14 @@ phpbb.resizeTextArea = function(items, options) { height = parseInt($item.height()), scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0; - if (height > maxHeight) - { + if (height < 0) { + return; + } + + if (height > maxHeight) { setHeight(maxHeight); } - else if (scrollHeight > (height + 5)) - { + else if (scrollHeight > (height + 5)) { setHeight(Math.min(maxHeight, scrollHeight)); } } @@ -670,8 +671,7 @@ phpbb.resizeTextArea = function(items, options) { $(window).resize(function() { items.each(function() { - if ($(this).hasClass('auto-resized')) - { + if ($(this).hasClass('auto-resized')) { autoResize(this); } }); |