From 88279961c5e2f2bd0711fc4200d58b93b425199e Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Fri, 30 May 2014 15:14:07 +0200
Subject: fix autopaging and marking read, render items

---
 js/controller/ContentController.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'js/controller')

diff --git a/js/controller/ContentController.js b/js/controller/ContentController.js
index 1af22ea5c..a42ff04f6 100644
--- a/js/controller/ContentController.js
+++ b/js/controller/ContentController.js
@@ -74,15 +74,17 @@ function (Publisher, FeedResource, ItemResource, SettingsResource, data,
 
     this.scrollRead = (itemIds) => {
         let ids = [];
+        let feedIds = [];
 
         for (let itemId of itemIds) {
             let item = ItemResource.get(itemId);
             if (!item.keepUnread) {
                 ids.push(itemId);
-                FeedResource.markItemOfFeedRead(item.feedId);
+                feedIds.push(item.feedId);
             }
         }
 
+        FeedResource.markItemsOfFeedsRead(feedIds);
         ItemResource.markItemsRead(ids);
     };
 
@@ -106,7 +108,8 @@ function (Publisher, FeedResource, ItemResource, SettingsResource, data,
     this.getRelativeDate = (timestamp) => {
         if (timestamp !== undefined && timestamp !== '') {
             let languageCode = SettingsResource.get('language');
-            return moment.unix(timestamp).lang(languageCode).fromNow();
+            let date = moment.unix(timestamp).lang(languageCode).fromNow() + '';
+            return date;
         } else {
             return '';
         }
-- 
cgit v1.2.3