diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
| commit | 36ac48779c85ae324d2d702714677e360af5930d (patch) | |
| tree | f6e78cb3cefe3abf5dcac291938005d75ecb0bff /view/js/main.js | |
| parent | 0cd82ec680e6a5a352781861a63685038fea723a (diff) | |
| parent | 88669fa033d5b43d4cdad7b95c9af05bf9467d3b (diff) | |
| download | volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.gz volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.bz2 volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.zip | |
Merge remote-tracking branch 'upstream/master'
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, |