diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-06 22:42:12 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-06 22:42:12 +0200 |
| commit | b0db5ce2b393b73d1814ecb784036ac4be8405a8 (patch) | |
| tree | d7e39139c6a6b2477c209e178c002644d7938d53 /app/views/javascript/main.phtml | |
| parent | abf8d739dade6a8ceafa6e4473c3641491026418 (diff) | |
| parent | ca9e5f01351f34bb2751bc084783861b7c898513 (diff) | |
Merge branch 'patch-1' of github.com:Alkarex/FreshRSS into Alkarex-patch-doublon-autochargement
Diffstat (limited to 'app/views/javascript/main.phtml')
| -rw-r--r-- | app/views/javascript/main.phtml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index d50cd751d..dd17fce36 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -143,16 +143,18 @@ function next_entry() { last_active = $(".flux:last"); new_active = old_active.nextAll (".flux:first"); - if(last_active.attr("id") == new_active.attr("id")) { - load_more_posts (); - } - if (new_active.hasClass("flux")) { toggleContent (new_active, old_active); } else if (old_active[0] === undefined && new_active[0] === undefined) { toggleContent (first_active, old_active); } + + <?php if ($auto_load_more !== 'yes') { ?> + if(last_active.attr("id") == new_active.attr("id")) { + load_more_posts (); + } + <?php } ?> } function init_img () { |