aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-09-27 15:48:13 +0200
committerMario Vavti <mario@mariovavti.com>2017-09-27 15:48:13 +0200
commitfb60eeaa9a80484ca9532a717085626ad045c1bd (patch)
tree4f6725a1fc5b0da9a1d622f0a698fa3f21f3ce6e
parent9625d940a5383d7a6dba5a711bb3ce8a12becdd9 (diff)
downloadvolse-hubzilla-fb60eeaa9a80484ca9532a717085626ad045c1bd.tar.gz
volse-hubzilla-fb60eeaa9a80484ca9532a717085626ad045c1bd.tar.bz2
volse-hubzilla-fb60eeaa9a80484ca9532a717085626ad045c1bd.zip
make justifiedGallery happy again
-rw-r--r--view/js/main.js1
-rwxr-xr-xview/tpl/photo_album.tpl4
-rwxr-xr-xview/tpl/photos_recent.tpl4
3 files changed, 7 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 1634eef1b..73b2f3616 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -945,6 +945,7 @@ function pageUpdate() {
function justifyPhotos(id) {
justifiedGalleryActive = true;
+ $('#' + id).show();
$('#' + id).justifiedGallery({
selector: 'a, div:not(.spinner, #page-end)',
margins: 3,
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index e27cdd10b..8dadeb8cb 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -19,7 +19,7 @@
{{$upload_form}}
{{$album_edit.1}}
<div class="section-content-wrapper-np">
- <div id="photo-album-contents-{{$album_id}}">
+ <div id="photo-album-contents-{{$album_id}}" style="display: none">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
@@ -29,8 +29,10 @@
</div>
<div class="photos-end"></div>
<script>
+$(document).ready(function() {
loadingPage = false;
justifyPhotos('photo-album-contents-{{$album_id}}');
+});
</script>
<div id="page-spinner" class="spinner-wrapper">
<div class="spinner m"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 43627883d..c8b20d468 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -10,7 +10,7 @@
</div>
{{$upload_form}}
<div class="section-content-wrapper-np">
- <div id="photo-album-contents-{{$album_id}}">
+ <div id="photo-album-contents-{{$album_id}}" style="display: none">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
@@ -20,8 +20,10 @@
</div>
<div class="photos-end"></div>
<script>
+$(document).ready(function() {
loadingPage = false;
justifyPhotos('photo-album-contents-{{$album_id}}');
+});
</script>
<div id="page-spinner" class="spinner-wrapper">
<div class="spinner m"></div>