diff options
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index e263fd116..13f1fea8f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -705,6 +705,7 @@ function updateConvItems(mode,data) { } function justifyPhotos(bParam_page) { + justifiedGalleryActive = true; $('#photo-album-contents-' + bParam_page).justifiedGallery({ lastRow : 'nojustify', captions: true, @@ -718,7 +719,7 @@ function updateConvItems(mode,data) { 'lt640': '', 'lt1024': '' } - }); + }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } function notify_popup_loader(notifyType) { @@ -1134,9 +1135,9 @@ $(window).scroll(function () { $('#more').css("top","400"); $('#more').show(); } - + if($(window).scrollTop() + $(window).height() == $(document).height()) { - if((pageHasMoreContent) && (! loadingPage)) { + if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); |