diff options
| author | marijus <mario@mariovavti.com> | 2014-09-12 21:32:53 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-09-12 21:32:53 +0200 |
| commit | 61ce524a33c3195794a24c4ce5820684369c58dd (patch) | |
| tree | 4e54cdf6148b87926aeed22a590b66686bbe3ceb /view | |
| parent | 72c30ea4441cfd5331dbdc4e6dd0a6f79f6518b3 (diff) | |
| download | volse-hubzilla-61ce524a33c3195794a24c4ce5820684369c58dd.tar.gz volse-hubzilla-61ce524a33c3195794a24c4ce5820684369c58dd.tar.bz2 volse-hubzilla-61ce524a33c3195794a24c4ce5820684369c58dd.zip | |
define justifiedGalleryActive in head.tpl to not break other pages autoload
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 |
2 files changed, 2 insertions, 1 deletions
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(); diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 703b08547..9c9e7b970 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -25,6 +25,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; + var justifiedGalleryActive = false; </script> |