diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-30 16:12:51 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-30 16:12:51 +0200 |
| commit | e9a2c6bac0dceeffb86e9fb50802af945555d565 (patch) | |
| tree | 07d7013d9ff0ccec4461f4f257eae1599f471fa8 /js/build/app.js | |
| parent | 88279961c5e2f2bd0711fc4200d58b93b425199e (diff) | |
more stuff
Diffstat (limited to 'js/build/app.js')
| -rw-r--r-- | js/build/app.js | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/js/build/app.js b/js/build/app.js index a8119dc82..d6355a108 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -85,7 +85,7 @@ var $__build_47_app__ = function () { templateUrl: 'content.html', resolve: getResolve(feedType.FOLDER), type: feedType.FOLDER - }).otherwise({ redirectTo: '/items' }); + }); } ]); app.run([ @@ -116,14 +116,15 @@ var $__build_47_app__ = function () { settingsDeferred.resolve(); }); var activeFeedDeferred = $q.defer(); + var path = $location.path(); $http.get(BASE_URL + '/feeds/active').success(function (data) { var url; - switch (data.type) { + switch (data.activeFeed.type) { case FEED_TYPE.FEED: - url = '/items/feeds/${data.id}'; + url = '/items/feeds/' + data.activeFeed.id; break; case FEED_TYPE.FOLDER: - url = '/items/folders/${data.id}'; + url = '/items/folders/' + data.activeFeed.id; break; case FEED_TYPE.STARRED: url = '/items/starred'; @@ -131,7 +132,9 @@ var $__build_47_app__ = function () { default: url = '/items'; } - $location.path(url); + if (path === '') { + $location.path(url); + } activeFeedDeferred.resolve(); }); var folderDeferred = $q.defer(); @@ -961,7 +964,7 @@ var $__build_47_app__ = function () { scrollArea.scrollTop(item.offset().top - scrollArea.offset().top + scrollArea.scrollTop()); }; var scrollToNextItem = function (scrollArea) { - var items = scrollArea.find('.feed_item'); + var items = scrollArea.find('.item'); for (var $__3 = items[$traceurRuntime.toProperty(Symbol.iterator)](), $__4; !($__4 = $__3.next()).done;) { try { throw undefined; @@ -979,7 +982,7 @@ var $__build_47_app__ = function () { scrollArea.scrollTop(scrollArea.prop('scrollHeight')); }; var scrollToPreviousItem = function (scrollArea) { - var items = scrollArea.find('.feed_item'); + var items = scrollArea.find('.item'); for (var $__3 = items[$traceurRuntime.toProperty(Symbol.iterator)](), $__4; !($__4 = $__3.next()).done;) { try { throw undefined; @@ -1006,7 +1009,7 @@ var $__build_47_app__ = function () { } }; var getActiveItem = function (scrollArea) { - var items = scrollArea.find('.feed_item'); + var items = scrollArea.find('.item'); for (var $__3 = items[$traceurRuntime.toProperty(Symbol.iterator)](), $__4; !($__4 = $__3.next()).done;) { try { throw undefined; |