mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-03 22:17:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Corrige bug mode endless dans la vue globale

Browse Source 
Problème d'initialisation après le remaniement du code
Corrige #275
This commit is contained in:
Marien Fressinaud
2013-11-17 11:23:23 +01:00
committed by Alexandre Alapetite
parent b592b60e32
commit fb5bcbe044
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/scripts/main.js
View File

@@ -478,17 +478,18 @@ function init_notifications() {
//<endless_mode>
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();
}