Fixing mark feed/folder as read and moving to next feed/folder much more quickly.

This commit is contained in:
Samuel Clay 2015-08-06 11:45:56 -07:00
parent 9bf765ba07
commit 4f035155aa
2 changed files with 11 additions and 7 deletions

2
fabfile.py vendored
View file

@ -958,7 +958,7 @@ def setup_redis(slave=False):
# sudo('chmod 666 /proc/sys/vm/overcommit_memory', pty=False)
# run('echo "1" > /proc/sys/vm/overcommit_memory', pty=False)
# sudo('chmod 644 /proc/sys/vm/overcommit_memory', pty=False)
sudo("echo 1 | sudo tee /proc/sys/vm/overcommit_memory\"")
sudo("echo 1 | sudo tee /proc/sys/vm/overcommit_memory")
sudo('echo "vm.overcommit_memory = 1" | sudo tee -a /etc/sysctl.conf')
sudo("sysctl vm.overcommit_memory=1")
put('config/redis_rclocal.txt', '/etc/rc.local', use_sudo=True)

View file

@ -2245,11 +2245,13 @@
this.model.mark_feed_as_read([feed_id], cutoff_timestamp, direction,
feed_id == this.active_feed, _.bind(function() {
if (!direction && NEWSBLUR.assets.preference('markread_nextfeed') == 'nextfeed') {
this.show_next_feed(1);
}
this.feeds_unread_count(feed_id);
}, this));
if (!direction && NEWSBLUR.assets.preference('markread_nextfeed') == 'nextfeed' &&
NEWSBLUR.reader.active_feed == feed_id) {
this.show_next_feed(1);
}
},
mark_folder_as_read: function(folder, days_back, direction) {
@ -2267,10 +2269,12 @@
if (!this.socket || !this.socket.socket || !this.socket.socket.connected) {
this.force_feeds_refresh(null, false, feeds);
}
if (!direction && NEWSBLUR.assets.preference('markread_nextfeed') == 'nextfeed') {
this.show_next_feed(1);
}
}, this));
if (!direction && NEWSBLUR.assets.preference('markread_nextfeed') == 'nextfeed' &&
NEWSBLUR.reader.active_folder == folder) {
this.show_next_feed(1);
}
},
open_story_trainer: function(story_id, feed_id, options) {