From fb5bcbe044a8273d54fdc7bc525106a2ef797fc5 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 17 Nov 2013 11:23:23 +0100 Subject: Corrige bug mode endless dans la vue globale MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problème d'initialisation après le remaniement du code Corrige #275 --- public/scripts/main.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'public/scripts') diff --git a/public/scripts/main.js b/public/scripts/main.js index 159bf48b3..2794e2913 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -478,17 +478,18 @@ function init_notifications() { // var url_load_more = "", - load_more = false; + load_more = false, + box_load_more = null; function load_more_posts() { - if (load_more || url_load_more === '') { + if (load_more || url_load_more === '' || box_load_more === null) { return; } load_more = true; $('#load_more').addClass('loading'); $.get(url_load_more, function (data) { - $stream.children('.flux:last').after($('#stream', data).children('.flux, .day')); + box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day')); $('.pagination').replaceWith($('.pagination', data)); $('[id^=day_]').each(function (i) { @@ -496,7 +497,7 @@ function load_more_posts() { if (ids.length > 1) $('[id="' + this.id + '"]:gt(0)').remove(); }); - init_load_more(); + init_load_more(box_load_more); init_lazyload(); $('#load_more').removeClass('loading'); @@ -504,7 +505,7 @@ function load_more_posts() { }); } -function init_load_more() { +function init_load_more(box) { var $next_link = $("#load_more"); if (!$next_link.length) { // no more article to load @@ -512,6 +513,8 @@ function init_load_more() { return; } + box_load_more = box; + url_load_more = $next_link.attr("href"); var $prefetch = $('#prefetch'); if ($prefetch.attr('href') !== url_load_more) { @@ -616,7 +619,7 @@ function init_all() { init_templates(); init_notifications(); init_actualize(); - init_load_more(); + init_load_more($stream); if (use_persona) { init_persona(); } -- cgit v1.2.3