diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-18 22:46:21 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-18 22:46:21 -0700 |
| commit | 74827133b29138b9209131a0ec192cd00aff4b19 (patch) | |
| tree | fae66745f0614cb913d2d85d117722987137a6d6 /library | |
| parent | 43251ed8ce8a59472686321b8faa2b352928d239 (diff) | |
| parent | 7c8706757db1df0195edc64f35ca1554d04eb414 (diff) | |
| download | volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.tar.gz volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.tar.bz2 volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
Diffstat (limited to 'library')
| -rw-r--r-- | library/readmore.js/readmore.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index e790ceb76..d4c1cf723 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -62,7 +62,7 @@ function setBoxHeights(element) { var el = element, - expandedHeight = el.outerHeight(), + expandedHeight = el.outerHeight(true), cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), defaultHeight = element.data('defaultHeight'); |