mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-04 06:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #794 from aledeg/auto-remove-when-read

Browse Source 
Add a cleaning process in the auto-remove feature.
This commit is contained in:
Marien Fressinaud
2015-02-17 13:16:34 +01:00
parent c0aba0a371 6e7bdb1709
commit edc6816aec
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
p/scripts/main.js
View File

@@ -238,12 +238,7 @@ function toggleContent(new_active, old_active) {
old_active.removeClass("active current");
new_active.addClass("current");
if (context['auto_remove_article'] && !old_active.hasClass('not_read')) {
var p = old_active.prev();
var n = old_active.next();
if (p.hasClass('day') && n.hasClass('day')) {
p.remove();
}
old_active.remove();
auto_remove(old_active);
}
} else {
new_active.toggleClass('active');
@@ -258,7 +253,7 @@ function toggleContent(new_active, old_active) {
if (context['sticky_post']) {
var prev_article = new_active.prevAll('.flux'),
new_pos = new_active.position().top,
new_pos = new_active.position().top,
old_scroll = $(box_to_move).scrollTop();
if (prev_article.length > 0 && new_pos - prev_article.position().top <= 150) {
@@ -289,6 +284,16 @@ function toggleContent(new_active, old_active) {
}
}
function auto_remove(element) {
var p = element.prev();
var n = element.next();
if (p.hasClass('day') && n.hasClass('day')) {
p.remove();
}
element.remove();
$('#stream > .flux:not(.not_read):not(.active)').remove();
}
function prev_entry() {
var old_active = $(".flux.current"),
new_active = old_active.length === 0 ? $(".flux:last") : old_active.prevAll(".flux:first");
@@ -683,7 +688,7 @@ function init_stream(divStream) {
}
var old_active = $(".flux.current"),
new_active = $(this).parent();
isCollapsed = true;
isCollapsed = true;
if (e.target.tagName.toUpperCase() === 'A') { //Leave real links alone
if (context['auto_mark_article']) {
mark_read(new_active, true);
@@ -696,12 +701,7 @@ function init_stream(divStream) {
divStream.on('click', '.flux a.read', function () {
var active = $(this).parents(".flux");
if (context['auto_remove_article'] && active.hasClass('not_read')) {
var p = active.prev();
var n = active.next();
if (p.hasClass('day') && n.hasClass('day')) {
p.remove();
}
active.remove();
auto_remove(active);
}
mark_read(active, false);
return false;
@@ -882,8 +882,8 @@ function notifs_html5_show(nb) {
if (context['html5_notif_timeout'] !== 0){
setTimeout(function() {
notification.close();
}, context['html5_notif_timeout'] * 1000);
notification.close();
}, context['html5_notif_timeout'] * 1000);
}
}
@@ -899,7 +899,7 @@ function init_notifs_html5() {
function refreshUnreads() {
$.getJSON('./?c=javascript&a=nbUnreadsPerFeed').done(function (data) {
var isAll = $('.category.all.active').length > 0,
new_articles = false;
new_articles = false;
$.each(data, function(feed_id, nbUnreads) {
feed_id = 'f_' + feed_id;
@@ -1195,7 +1195,7 @@ function faviconNbUnread(n) {
function init_slider_observers() {
var slider = $('#slider'),
closer = $('#close-slider');
closer = $('#close-slider');
if (slider.length < 1) {
return;
}