summaryrefslogtreecommitdiffstats
path: root/js/app
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-05-09 14:03:37 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-05-09 14:03:37 +0200
commit019b286b8e997bea3fb6a0555c91c565ca2d684f (patch)
treed162de276a9571f89f29fc0691258f38571edff8 /js/app
parent59069e85a26dd72bb1798e0ee517d607f6021443 (diff)
Fix a bug that would mark the items on the right side as read regardless of feed or folder id
Diffstat (limited to 'js/app')
-rw-r--r--js/app/services/businesslayer/feedbusinesslayer.coffee5
-rw-r--r--js/app/services/businesslayer/folderbusinesslayer.coffee8
2 files changed, 9 insertions, 4 deletions
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index b2eb4f293..8dc1c126a 100644
--- a/js/app/services/businesslayer/feedbusinesslayer.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -70,9 +70,10 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)->
if angular.isDefined(feed) and newestItemId != 0
feed.unreadCount = 0
- @_persistence.setFeedRead(feedId, newestItemId)
for item in @_itemModel.getAll()
- item.setRead()
+ if item.feedId == feed.id
+ item.setRead()
+ @_persistence.setFeedRead(feedId, newestItemId)
getNumberOfFeeds: ->
diff --git a/js/app/services/businesslayer/folderbusinesslayer.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee
index 57f932a77..39c307c96 100644
--- a/js/app/services/businesslayer/folderbusinesslayer.coffee
+++ b/js/app/services/businesslayer/folderbusinesslayer.coffee
@@ -89,8 +89,12 @@ NewestItem, FeedModel) ->
if newestItemId != 0 and angular.isDefined(folder)
for feed in @_feedBusinessLayer.getFeedsOfFolder(folderId)
feed.unreadCount = 0
- for item in @_itemModel.getAll()
- item.setRead()
+
+ # also set items in feeds as read
+ for item in @_itemModel.getAll()
+ if item.feedId == feed.id
+ item.setRead()
+
@_persistence.setFolderRead(folderId, newestItemId)