diff options
| author | marijus <mario@mariovavti.com> | 2014-09-12 21:04:43 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-09-12 21:04:43 +0200 |
| commit | bd2139d16addf42b33f5f5cf90516022273bc8b6 (patch) | |
| tree | 8c8f481f4e5ebdfc87592ae9d3adb9490d1b72b6 /view/js | |
| parent | 59c537b06dbd905a4cc73b82d509c4cb0854fc05 (diff) | |
| download | volse-hubzilla-bd2139d16addf42b33f5f5cf90516022273bc8b6.tar.gz volse-hubzilla-bd2139d16addf42b33f5f5cf90516022273bc8b6.tar.bz2 volse-hubzilla-bd2139d16addf42b33f5f5cf90516022273bc8b6.zip | |
do not load next page if justifiedGallery() is not ready yet
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index e263fd116..56c60bd6e 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) { @@ -1136,7 +1137,7 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() == $(document).height()) { - if((pageHasMoreContent) && (! loadingPage)) { + if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); |