diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-23 14:32:53 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-23 14:32:53 +0100 |
commit | df509a4b856472fa22fd6d43a212c9d21bd5b40f (patch) | |
tree | be8be7824bd4ba3ee687c6e57d1383929360e505 /js/controller | |
parent | 5adeba1a560985173974c9ac98c624093055d669 (diff) |
fix #711
Diffstat (limited to 'js/controller')
-rw-r--r-- | js/controller/ContentController.js | 20 | ||||
-rw-r--r-- | js/controller/NavigationController.js | 5 |
2 files changed, 23 insertions, 2 deletions
diff --git a/js/controller/ContentController.js b/js/controller/ContentController.js index 807a3eeb6..c5af2c6a5 100644 --- a/js/controller/ContentController.js +++ b/js/controller/ContentController.js @@ -70,8 +70,24 @@ function (Publisher, FeedResource, ItemResource, SettingsResource, data, item.keepUnread = !item.keepUnread; }; + var self = this; + var getOrdering = function () { + var ordering = SettingsResource.get('oldestFirst'); + + if (self.isFeed()) { + var feed = FeedResource.getById($routeParams.id); + if (feed && feed.ordering === 1) { + ordering = true; + } else if (feed && feed.ordering === 2) { + ordering = false; + } + } + + return ordering; + }; + this.orderBy = function () { - if (SettingsResource.get('oldestFirst')) { + if (getOrdering()) { return 'id'; } else { return '-id'; @@ -133,7 +149,7 @@ function (Publisher, FeedResource, ItemResource, SettingsResource, data, var type = $route.current.$$route.type; var id = $routeParams.id; - var oldestFirst = SettingsResource.get('oldestFirst'); + var oldestFirst = getOrdering(); var showAll = SettingsResource.get('showAll'); var self = this; diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js index 5f76eaddb..af2e3ac76 100644 --- a/js/controller/NavigationController.js +++ b/js/controller/NavigationController.js @@ -281,6 +281,11 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, FolderResource.delete(folder.name); }; + this.setOrdering = function (feed, ordering) { + FeedResource.setOrdering(feed.id, ordering); + $route.reload(); + }; + var self = this; $rootScope.$on('moveFeedToFolder', function (scope, data) { |