harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make justifiedGallery happy again

Browse Source
This commit is contained in:
Mario Vavti 2017-09-27 15:48:13 +02:00
parent 9625d940a5
commit fb60eeaa9a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
view/js/main.js
View File

@ -945,6 +945,7 @@ function pageUpdate() {
function justifyPhotos(id) { function justifyPhotos(id) {
justifiedGalleryActive = true; justifiedGalleryActive = true;
$('#' + id).show();
$('#' + id).justifiedGallery({ $('#' + id).justifiedGallery({
selector: 'a, div:not(.spinner, #page-end)', selector: 'a, div:not(.spinner, #page-end)',
margins: 3, margins: 3,

4
view/tpl/photo_album.tpl
View File

@ -19,7 +19,7 @@
{{$upload_form}} {{$upload_form}}
{{$album_edit.1}} {{$album_edit.1}}
<div class="section-content-wrapper-np"> <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}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
@ -29,8 +29,10 @@
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script> <script>
$(document).ready(function() {
loadingPage = false; loadingPage = false;
justifyPhotos('photo-album-contents-{{$album_id}}'); justifyPhotos('photo-album-contents-{{$album_id}}');
});
</script> </script>
<div id="page-spinner" class="spinner-wrapper"> <div id="page-spinner" class="spinner-wrapper">
<div class="spinner m"></div> <div class="spinner m"></div>

4
view/tpl/photos_recent.tpl
View File

@ -10,7 +10,7 @@
</div> </div>
{{$upload_form}} {{$upload_form}}
<div class="section-content-wrapper-np"> <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}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
@ -20,8 +20,10 @@
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script> <script>
$(document).ready(function() {
loadingPage = false; loadingPage = false;
justifyPhotos('photo-album-contents-{{$album_id}}'); justifyPhotos('photo-album-contents-{{$album_id}}');
});
</script> </script>
<div id="page-spinner" class="spinner-wrapper"> <div id="page-spinner" class="spinner-wrapper">
<div class="spinner m"></div> <div class="spinner m"></div>