diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-15 10:01:25 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-15 10:01:25 +0200 |
| commit | 4f793069bf4aafcfe77d50e47690173104ef23c7 (patch) | |
| tree | 7fe1bfcb18672300bf14967338690ea4fa51e640 /view/js | |
| parent | ed7f3001c1c1deec5076ae12114e5c42865b6251 (diff) | |
| parent | 58aad83e5cb0edaf1ccc543147030e782c5e7ba9 (diff) | |
| download | volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.tar.gz volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.tar.bz2 volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/view/js/main.js b/view/js/main.js index e263fd116..d6b405258 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -705,20 +705,19 @@ function updateConvItems(mode,data) { } function justifyPhotos(bParam_page) { + justifiedGalleryActive = true; $('#photo-album-contents-' + bParam_page).justifiedGallery({ lastRow : 'nojustify', - captions: true, margins: 3, - rowHeight : 150, sizeRangeSuffixes : { - 'lt100': '', - 'lt240': '', - 'lt320': '', - 'lt500': '', - 'lt640': '', - 'lt1024': '' + 'lt100': '-2', + 'lt240': '-2', + 'lt320': '-2', + 'lt500': '-1', + 'lt640': '-1', + 'lt1024': '-0' } - }); + }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } function notify_popup_loader(notifyType) { @@ -1134,9 +1133,9 @@ $(window).scroll(function () { $('#more').css("top","400"); $('#more').show(); } - + if($(window).scrollTop() + $(window).height() == $(document).height()) { - if((pageHasMoreContent) && (! loadingPage)) { + if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); |