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

define justifiedGalleryActive in head.tpl to not break other pages autoload

Browse Source
This commit is contained in:
marijus
2014-09-12 21:32:53 +02:00
parent 72c30ea444
commit 61ce524a33
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/js/main.js
View File

@@ -1135,7 +1135,7 @@ $(window).scroll(function () {
$('#more').css("top","400"); $('#more').css("top","400");
$('#more').show(); $('#more').show();
} }
if($(window).scrollTop() + $(window).height() == $(document).height()) { if($(window).scrollTop() + $(window).height() == $(document).height()) {
if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
$('#more').hide(); $('#more').hide();

1
view/tpl/head.tpl
View File

@@ -25,6 +25,7 @@
var updateInterval = {{$update_interval}}; var updateInterval = {{$update_interval}};
var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
var justifiedGalleryActive = false;
</script> </script>