From bd2139d16addf42b33f5f5cf90516022273bc8b6 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 12 Sep 2014 21:04:43 +0200
Subject: do not load next page if justifiedGallery() is not ready yet

---
 view/js/main.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/js')

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();
 
-- 
cgit v1.2.3


From 61ce524a33c3195794a24c4ce5820684369c58dd Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 12 Sep 2014 21:32:53 +0200
Subject: define justifiedGalleryActive in head.tpl to not break other pages
 autoload

---
 view/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/js')

diff --git a/view/js/main.js b/view/js/main.js
index 56c60bd6e..13f1fea8f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1135,7 +1135,7 @@ $(window).scroll(function () {
 			$('#more').css("top","400");
 			$('#more').show();
 		}
-	
+
 		if($(window).scrollTop() + $(window).height() == $(document).height()) {
 			if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
 				$('#more').hide();
-- 
cgit v1.2.3