dont mark feed read if newest item id is 0

5 files changed, 8 insertions, 19 deletions

diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index d7b78a75b..eb8d27de6 100644
--- a/js/app/services/businesslayer/feedbusinesslayer.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -68,7 +68,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)->
 			feed = @_feedModel.getById(feedId)
 			newestItemId = @_newestItem.getId()
 
-			if angular.isDefined(feed) and angular.isDefined(newestItemId)
+			if angular.isDefined(feed) and newestItemId != 0
 				feed.unreadCount = 0
 				@_persistence.setFeedRead(feedId, newestItemId)
 				for item in @_itemModel.getAll()
diff --git a/js/public/app.js b/js/public/app.js
index bc9a9b7b0..86aa989db 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -860,7 +860,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
           feed = this._feedModel.getById(feedId);
           newestItemId = this._newestItem.getId();
-          if (angular.isDefined(feed) && angular.isDefined(newestItemId)) {
+          if (angular.isDefined(feed) && newestItemId !== 0) {
             feed.unreadCount = 0;
             this._persistence.setFeedRead(feedId, newestItemId);
             _ref = this._itemModel.getAll();
diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
index feb687b2c..63268224e 100644
--- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
@@ -116,22 +116,8 @@ describe 'FeedBusinessLayer', ->
 		expect(@ItemModel.getById(2).isRead()).toBeTruthy()
 
 
-	it 'should mark feed as read and set 0 if as highest id if its not active',=>
-		@persistence.setFeedRead = jasmine.createSpy('setFeedRead')
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, url: 'a1'})
-		@ItemModel.add({id: 6, feedId: 5, guidHash: 'a1'})
-		@ItemModel.add({id: 3, feedId: 5, guidHash: 'a2'})
-		@ItemModel.add({id: 2, feedId: 5, guidHash: 'a3'})
-		@FeedBusinessLayer.markFeedRead(5)
-
-		expect(@persistence.setFeedRead).toHaveBeenCalledWith(5, 0)
-		expect(@FeedModel.getById(5).unreadCount).toBe(0)
-		expect(@ItemModel.getById(6).isRead()).toBeTruthy()
-		expect(@ItemModel.getById(3).isRead()).toBeTruthy()
-		expect(@ItemModel.getById(2).isRead()).toBeTruthy()
-
-
 	it 'should mark all as read', =>
+		@NewestItem.handle(25)
 		@persistence.setFeedRead = jasmine.createSpy('setFeedRead')
 		@FeedModel.add({id: 3, unreadCount:134, folderId: 3, url: 'a1'})
 		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, url: 'a2'})
diff --git a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
index 7179218c2..56d90de86 100644
--- a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
@@ -39,7 +39,8 @@ describe 'FolderBusinessLayer', ->
 
 
 	beforeEach inject (@FolderBusinessLayer, @FolderModel,	@FeedModel, @ShowAll,
-		               @ActiveFeed, @FeedType, @_ExistsError, @$timeout) =>
+		               @ActiveFeed, @FeedType, @_ExistsError, @$timeout,
+		               @NewestItem) =>
 		@ShowAll.setShowAll(false)
 		@ActiveFeed.handle({type: @FeedType.Feed, id:0})
 
@@ -81,6 +82,7 @@ describe 'FolderBusinessLayer', ->
 
 
 	it 'should mark folder as read', =>
+		@NewestItem.handle(25)
 		@persistence.setFeedRead = jasmine.createSpy('setFeedRead')
 		@FeedModel.add({id: 3, unreadCount:134, folderId: 3, url: 'a1'})
 		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, url: 'a2'})
diff --git a/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee b/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee
index c0d674bda..6193a9795 100644
--- a/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee
@@ -34,7 +34,7 @@ describe 'SubscriptionsBusinessLayer', ->
 		return
 
 	beforeEach inject (@SubscriptionsBusinessLayer, @ShowAll, @FeedModel,
-	                   @ActiveFeed, @FeedType) =>
+	                   @ActiveFeed, @FeedType, @NewestItem) =>
 		@ShowAll.setShowAll(false)
 		@ActiveFeed.handle({type: @FeedType.Feed, id:0})
 
@@ -69,6 +69,7 @@ describe 'SubscriptionsBusinessLayer', ->
 
 
 	it 'should mark all feeds as read', =>
+		@NewestItem.handle(25)
 		item = {id: 3, unreadCount: 132, url: 'hi'}
 		@FeedModel.add(item)