diff options
Diffstat (limited to 'js/app/services/businesslayer')
| -rw-r--r-- | js/app/services/businesslayer/businesslayer.coffee | 2 | ||||
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 11 | ||||
| -rw-r--r-- | js/app/services/businesslayer/itembusinesslayer.coffee | 7 |
3 files changed, 8 insertions, 12 deletions
diff --git a/js/app/services/businesslayer/businesslayer.coffee b/js/app/services/businesslayer/businesslayer.coffee index 622351333..3096eb71e 100644 --- a/js/app/services/businesslayer/businesslayer.coffee +++ b/js/app/services/businesslayer/businesslayer.coffee @@ -25,7 +25,7 @@ angular.module('News').factory '_BusinessLayer', -> class BusinessLayer - constructor: (@_activeFeed, @_persistence, @_itemModel, @_type, @_newest) -> + constructor: (@_activeFeed, @_persistence, @_itemModel, @_type) -> load: (id) -> diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index 796a6a6eb..d7b78a75b 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -66,14 +66,11 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)-> markFeedRead: (feedId) -> feed = @_feedModel.getById(feedId) - if angular.isDefined(feed) + newestItemId = @_newestItem.getId() + + if angular.isDefined(feed) and angular.isDefined(newestItemId) feed.unreadCount = 0 - if @_activeFeed.getId() == feedId and - @_activeFeed.getType() == @_feedType.Feed - highestItemId = @_newestItem.getId() - else - highestItemId = 0 - @_persistence.setFeedRead(feedId, highestItemId) + @_persistence.setFeedRead(feedId, newestItemId) for item in @_itemModel.getAll() item.setRead() diff --git a/js/app/services/businesslayer/itembusinesslayer.coffee b/js/app/services/businesslayer/itembusinesslayer.coffee index 7a2063a97..d9b5951ac 100644 --- a/js/app/services/businesslayer/itembusinesslayer.coffee +++ b/js/app/services/businesslayer/itembusinesslayer.coffee @@ -106,12 +106,11 @@ StarredBusinessLayer, NewestItem) -> loadNext: (callback) -> - size = @_itemModel.size() - if size != 0 + lowestItemId = @_itemModel.getLowestId() + if lowestItemId != 0 @_persistence.getItems @_activeFeed.getType(), @_activeFeed.getId(), - size, - @_newestItem.getId(), + lowestItemId, callback else callback() |