From db7b4ea2bf9437f572f1501356753eaf84e954a3 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 14 Feb 2015 22:18:50 +0100
Subject: update justifiedGallery to version 3.5.4 and add ignoreElement option
 which will hopefully be accepted upstream

---
 view/js/main.js         | 2 ++
 view/php/theme_init.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 17ea42db7..7a6798f2f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -713,6 +713,8 @@ function updateConvItems(mode,data) {
 		justifiedGalleryActive = true;
 		$('#photo-album-contents').justifiedGallery({
 			margins: 3,
+			border: 0,
+			ignoreElement: '#page-end',
 			sizeRangeSuffixes: {
 				'lt100': '-2',
 				'lt240': '-2',
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 0009a00e2..b695bd54e 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -9,11 +9,11 @@ head_add_css('library/jRange/jquery.range.css');
 head_add_css('view/css/conversation.css');
 head_add_css('view/css/widgets.css');
 head_add_css('view/css/colorbox.css');
-head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css');
+head_add_css('library/justifiedGallery/justifiedGallery.css');
 head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_js('jquery.js');
 head_add_js('jquery-migrate-1.1.1.js');
-head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js');
+head_add_js('library/justifiedGallery/jquery.justifiedGallery.js');
 
 //head_add_js('jquery-compat.js');
 head_add_js('spin.js');
-- 
cgit v1.2.3