aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-09-12 21:04:43 +0200
committermarijus <mario@mariovavti.com>2014-09-12 21:04:43 +0200
commitbd2139d16addf42b33f5f5cf90516022273bc8b6 (patch)
tree8c8f481f4e5ebdfc87592ae9d3adb9490d1b72b6 /view
parent59c537b06dbd905a4cc73b82d509c4cb0854fc05 (diff)
downloadvolse-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')
-rw-r--r--view/js/main.js5
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();