diff options
| author | mrjive <mrjive@mrjive.it> | 2016-02-03 22:46:54 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-02-03 22:46:54 +0100 |
| commit | e527a52f6a123b695775a24fdeb64d0a5ab00df9 (patch) | |
| tree | 7f72feb65e8f8790d6d80f631d1e608bfed1dd48 /view/js/main.js | |
| parent | 337735094b944fd31ed96e36c869227a0d63e5d1 (diff) | |
| parent | a7ed50ecd4b4defbc1d5fdf0bb4fd7d65d08a0fd (diff) | |
| download | volse-hubzilla-e527a52f6a123b695775a24fdeb64d0a5ab00df9.tar.gz volse-hubzilla-e527a52f6a123b695775a24fdeb64d0a5ab00df9.tar.bz2 volse-hubzilla-e527a52f6a123b695775a24fdeb64d0a5ab00df9.zip | |
Merge pull request #21 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index 220898efd..2b13acc3d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -640,7 +640,10 @@ function collapseHeight() { var orgHeight = parseInt($(this).css('height')); if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { - if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) { + + var trigger = $(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top ? true : false; + + if(trigger) { $(this).readmore({ speed: 0, heightMargin: 50, |