diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-12 16:16:14 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-12 16:16:14 -0700 |
| commit | 42db2bc93d4ac0f90de1789fbf6df797c45b679e (patch) | |
| tree | 7d75d1596d50fa5ba07cb9e931a52b0e9cabe964 /view/js/main.js | |
| parent | a2f5b55d10e5ed18494da99381874319c9a835d5 (diff) | |
| parent | 43eefb5929ea81cbe3a4318eb8374151e3b9d9f2 (diff) | |
| download | volse-hubzilla-42db2bc93d4ac0f90de1789fbf6df797c45b679e.tar.gz volse-hubzilla-42db2bc93d4ac0f90de1789fbf6df797c45b679e.tar.bz2 volse-hubzilla-42db2bc93d4ac0f90de1789fbf6df797c45b679e.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index 34d6bf475..14d9dcd2f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -616,7 +616,7 @@ function updateConvItems(mode,data) { function collapseHeight() { $(".wall-item-content, .directory-collapse").each(function() { - var orgHeight = $(this).height(); + var orgHeight = $(this).outerHeight(true); if(orgHeight > divmore_height + 10) { if(! $(this).hasClass('divmore')) { $(this).readmore({ |