From 2af8a941ffb86aa2291e9f2ddead2372be1f9493 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Sun, 2 Mar 2014 18:45:37 +0100 Subject: [PATCH] Fixed user list on Chrome w/ endless pagination --- public_html/media/css/user-list.css | 6 +----- public_html/media/js/paginator-endless.js | 13 +++++++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/public_html/media/css/user-list.css b/public_html/media/css/user-list.css index 7866a60f..2fe3cb93 100644 --- a/public_html/media/css/user-list.css +++ b/public_html/media/css/user-list.css @@ -17,17 +17,13 @@ nav.sort-styles li.active { .users-wrapper { text-align: center; } -.users { - column-width: 20em; - -moz-column-width: 20em; - -webkit-column-width: 20em; -} .user { text-align: initial; line-height: 1.5em; margin-bottom: 1em; margin-right: 1em; + float: left; white-space: pre; } diff --git a/public_html/media/js/paginator-endless.js b/public_html/media/js/paginator-endless.js index ded9e59e..e02584b4 100644 --- a/public_html/media/js/paginator-endless.js +++ b/public_html/media/js/paginator-endless.js @@ -1,7 +1,10 @@ function scrolled() { var margin = 150; - if ($(document).height() <= $(window).scrollTop() + $(window).height() + margin) + var target = $('.paginator-content:eq(0)'); + var y = $(window).scrollTop() + $(window).height(); + var maxY = target.height() + target.position().top; + if (y >= maxY - margin) { var pageNext = $(document).data('page-next'); var pageDone = $(document).data('page-done'); @@ -17,7 +20,13 @@ function scrolled() var dom = $(response); var nextPage = dom.find('.paginator .next:not(.disabled) a').attr('href'); $(document).data('page-next', nextPage); - $('.paginator-content').append($(response).find('.paginator-content').children().css({opacity: 0}).animate({opacity: 1}, 'slow')); + + var source = $(response).find('.paginator-content'); + target.append(source + .children() + .css({opacity: 0}) + .animate({opacity: 1}, 'slow')); + $('body').trigger('dom-update'); scrolled(); });