diff options
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/view/js/main.js b/view/js/main.js index ae90bb272..8c4fcdc13 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -700,30 +700,10 @@ function updateConvItems(mode,data) { updatePageItems(update_mode,data); $("#page-spinner").spin(false); in_progress = false; - justifyPhotos(); }); } - function justifyPhotos() { - if($('#photo-album-contents').length > 0) { - loadingPage = true; - $('#photo-album-contents').justifiedGallery({ - lastRow : 'nojustify', - captions: true, - margins: 3, - rowHeight : 150, - sizeRangeSuffixes : { - 'lt100': '', - 'lt240': '', - 'lt320': '', - 'lt500': '', - 'lt640': '', - 'lt1024': '' - } - }).on('jg.complete', function(e){ loadingPage = false; }); - } - } function notify_popup_loader(notifyType) { @@ -1070,6 +1050,7 @@ function previewTheme(elm) { } $(document).ready(function() { + jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], prefixFromNow : aStr['t02'], @@ -1093,8 +1074,6 @@ $(document).ready(function() { $(".autotime").timeago(); - justifyPhotos(); - }); function zFormError(elm,x) { @@ -1110,7 +1089,7 @@ $(document).ready(function() { -$(window).scroll(function () { +$(window).scroll(function () { if(typeof buildCmd == 'function') { // This is a content page with items and/or conversations $('#more').hide(); @@ -1120,8 +1099,8 @@ $(window).scroll(function () { $('#more').css("top","400"); $('#more').show(); } - - if($(window).scrollTop() + $(window).height() == $(document).height()) { + + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); @@ -1141,7 +1120,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); |