diff options
Diffstat (limited to 'js/build/app.js')
| -rw-r--r-- | js/build/app.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/js/build/app.js b/js/build/app.js index 5f299d8c9..472f1731a 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -107,10 +107,12 @@ app.config(["$routeProvider", "$provide", "$httpProvider", function ($routeProvi // check if a custom ordering is set if (type === FEED_TYPE.FEED) { var feed = FeedResource.getById(parameters.id); - if (feed.ordering === 1) { - parameters.oldestFirst = true; - } else if (feed.ordering === 2) { + + // on intial load, the feed ordering is undefined + if (feed === undefined || feed.ordering === 2) { parameters.oldestFirst = false; + } else if (feed.ordering === 1) { + parameters.oldestFirst = true; } } @@ -2013,6 +2015,7 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL) var input = $('input[ng-model="Navigation.feed.url"]'); input.val(subscription); + input.trigger('input'); // hacky way to focus because initial loading of a feed // steals the focus |