diff options
Diffstat (limited to 'js/controller/ContentController.js')
-rw-r--r-- | js/controller/ContentController.js | 20 |
1 files changed, 18 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; |