diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/app/Config.js | 6 | ||||
-rw-r--r-- | js/app/Run.js | 4 | ||||
-rw-r--r-- | js/controller/ContentController.js | 14 |
3 files changed, 4 insertions, 20 deletions
diff --git a/js/app/Config.js b/js/app/Config.js index 8ac503b44..f7c62e7ae 100644 --- a/js/app/Config.js +++ b/js/app/Config.js @@ -191,12 +191,6 @@ app.config(function ($routeProvider, $provide, $httpProvider, $locationProvider) resolve: getItemResolve(feedType.STARRED), type: feedType.STARRED }) - .when('/items/shared', { - controller: 'ContentController as Content', - templateUrl: 'content.html', - resolve: getItemResolve(feedType.SHARED), - type: feedType.SHARED - }) .when('/items/unread', { controller: 'ContentController as Content', templateUrl: 'content.html', diff --git a/js/app/Run.js b/js/app/Run.js index 6aa79f7dd..1a1572864 100644 --- a/js/app/Run.js +++ b/js/app/Run.js @@ -45,10 +45,6 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading, url = '/items/starred'; break; - case FEED_TYPE.SHARED: - url = '/items/shared'; - break; - case FEED_TYPE.EXPLORE: url = '/explore'; break; diff --git a/js/controller/ContentController.js b/js/controller/ContentController.js index 97520f72c..06389ef14 100644 --- a/js/controller/ContentController.js +++ b/js/controller/ContentController.js @@ -89,9 +89,7 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou if (!item.keepUnread && item.unread === true) { ItemResource.markItemRead(itemId); - if (item.isShared === false) { - FeedResource.markItemOfFeedRead(item.feedId); - } + FeedResource.markItemOfFeedRead(item.feedId); } }; @@ -103,9 +101,7 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou var item = ItemResource.get(itemId); if (!item.unread) { ItemResource.markItemRead(itemId, false); - if (item.isShared === false) { - FeedResource.markItemOfFeedUnread(item.feedId); - } + FeedResource.markItemOfFeedUnread(item.feedId); } item.keepUnread = !item.keepUnread; @@ -140,10 +136,8 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou itemIds.forEach(function (itemId) { var item = ItemResource.get(itemId); if (!item.keepUnread) { - if (item.isShared === false) { - ids.push(itemId); - feedIds.push(item.feedId); - } + ids.push(itemId); + feedIds.push(item.feedId); } }); |