public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing reading social stories with no feed on river blurblog. Whew.

Browse source
This commit is contained in:
Samuel Clay 2012-12-13 17:58:19 -08:00
parent 327b300fe0
commit 029ff899af
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/js/newsblur/common/assetmodel.js
View file

@ -137,7 +137,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
mark_social_story_as_read: function(story, social_feed, callback) {
var self = this;
var feed_id = story.get('story_feed_id');
var social_user_id = social_feed.get('user_id');
var social_user_id = social_feed && social_feed.get('user_id');
if (!social_user_id) {
social_user_id = story.get('friend_user_ids')[0];
}

12
media/js/newsblur/models/stories.js
View file

@ -137,27 +137,27 @@ NEWSBLUR.Collections.Stories = Backbone.Collection.extend({
}
if (story.score() > 0) {
var active_count = Math.max(active_feed.get('ps') + (options.unread?1:-1), 0);
var active_count = active_feed && Math.max(active_feed.get('ps') + (options.unread?1:-1), 0);
var story_count = story_feed && Math.max(story_feed.get('ps') + (options.unread?1:-1), 0);
active_feed.set('ps', active_count, {instant: true});
if (active_feed) active_feed.set('ps', active_count, {instant: true});
if (story_feed) story_feed.set('ps', story_count, {instant: true});
_.each(friend_feeds, function(socialsub) {
var socialsub_count = Math.max(socialsub.get('ps') + (options.unread?1:-1), 0);
socialsub.set('ps', socialsub_count, {instant: true});
});
} else if (story.score() == 0) {
var active_count = Math.max(active_feed.get('nt') + (options.unread?1:-1), 0);
var active_count = active_feed && Math.max(active_feed.get('nt') + (options.unread?1:-1), 0);
var story_count = story_feed && Math.max(story_feed.get('nt') + (options.unread?1:-1), 0);
active_feed.set('nt', active_count, {instant: true});
if (active_feed) active_feed.set('nt', active_count, {instant: true});
if (story_feed) story_feed.set('nt', story_count, {instant: true});
_.each(friend_feeds, function(socialsub) {
var socialsub_count = Math.max(socialsub.get('nt') + (options.unread?1:-1), 0);
socialsub.set('nt', socialsub_count, {instant: true});
});
} else if (story.score() < 0) {
var active_count = Math.max(active_feed.get('ng') + (options.unread?1:-1), 0);
var active_count = active_feed && Math.max(active_feed.get('ng') + (options.unread?1:-1), 0);
var story_count = story_feed && Math.max(story_feed.get('ng') + (options.unread?1:-1), 0);
active_feed.set('ng', active_count, {instant: true});
if (active_feed) active_feed.set('ng', active_count, {instant: true});
if (story_feed) story_feed.set('ng', story_count, {instant: true});
_.each(friend_feeds, function(socialsub) {
var socialsub_count = Math.max(socialsub.get('ng') + (options.unread?1:-1), 0);