diff options
| author | friendica <info@friendica.com> | 2014-09-12 14:24:45 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-12 14:24:45 -0700 |
| commit | 7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6 (patch) | |
| tree | e5f559b44e859e7f9bddd0a022d3be9849434b51 /view/js/main.js | |
| parent | 5fd0d6f7d553d79e2362a480ec504d102b299fd0 (diff) | |
| parent | 61ce524a33c3195794a24c4ce5820684369c58dd (diff) | |
| download | volse-hubzilla-7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6.tar.gz volse-hubzilla-7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6.tar.bz2 volse-hubzilla-7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6.zip | |
Merge https://github.com/friendica/red into pending_merge
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(); |