diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-10-01 22:58:44 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-10-01 22:58:44 +0100 |
| commit | 70fd797994e4b861d20d99cec2a7d801e478d894 (patch) | |
| tree | 5b00b61522f2c7136912396df54bd3251e3f17c8 /js | |
| parent | 2c9c206808fec2212141f8630ce534ed29a47037 (diff) | |
| parent | 27e97571d44f9e69a66eead9da2de4209996457d (diff) | |
| download | volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2 volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js')
| -rw-r--r-- | js/main.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/main.js b/js/main.js index 9d764c74e..cd5040064 100644 --- a/js/main.js +++ b/js/main.js @@ -119,6 +119,7 @@ var next_page = 1; var page_load = true; var loadingPage = false; + var pageHasMoreContent = true; $(function() { $.ajaxSetup({cache: false}); @@ -984,7 +985,7 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() == $(document).height()) { - if(! loadingPage) { + if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); // alert('scroll'); |