harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-09-16 19:09:30 -07:00
commit ce36e8a8bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/js/main.js
View File

@ -1114,7 +1114,7 @@ $(window).scroll(function () {
$('#more').show(); $('#more').show();
} }
if($(window).scrollTop() + $(window).height() == $(document).height()) { if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
if((pageHasMoreContent) && (! loadingPage)) { if((pageHasMoreContent) && (! loadingPage)) {
$('#more').hide(); $('#more').hide();
$('#no-more').hide(); $('#no-more').hide();
@ -1134,7 +1134,7 @@ $(window).scroll(function () {
$('#more').show(); $('#more').show();
} }
if($(window).scrollTop() + $(window).height() == $(document).height()) { if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
$('#more').hide(); $('#more').hide();
$('#no-more').hide(); $('#no-more').hide();