aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/photos.php4
-rw-r--r--view/js/main.js5
2 files changed, 5 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php
index f2df894c0..c11d04192 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -635,7 +635,7 @@ function photos_content(&$a) {
);
if(count($r)) {
$a->set_pager_total(count($r));
- $a->set_pager_itemspage(60);
+ $a->set_pager_itemspage(5);
}
if($_GET['order'] === 'posted')
@@ -1168,7 +1168,7 @@ function photos_content(&$a) {
);
if(count($r)) {
$a->set_pager_total(count($r));
- $a->set_pager_itemspage(60);
+ $a->set_pager_itemspage(5);
}
$r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
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();