summaryrefslogtreecommitdiffstats
path: root/js/controller
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-12 00:58:47 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-12 00:58:47 +0200
commit6f68f42535cb84bc9e28848cfc4f72cd53f2141d (patch)
tree397771e40002166f21a92c158dfd92a1eb562039 /js/controller
parentfc4aa4d97b7bebbf2c1a297ba6d6ab05bb5891c3 (diff)
if a feed is created, load it
Diffstat (limited to 'js/controller')
-rw-r--r--js/controller/NavigationController.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index 4b1cd8616..ba09f630a 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -9,7 +9,7 @@
*/
app.controller('NavigationController',
function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
- SettingsResource, Publisher, $rootScope) {
+ SettingsResource, Publisher, $rootScope, $location) {
'use strict';
this.feedError = '';
@@ -126,6 +126,7 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
FeedResource.create(feed.url, feed.folderId, undefined)
.then(function (data) {
Publisher.publishAll(data);
+ $location.path('/items/feeds/' + data.id);
});
} else {
// create folder first and then the feed
@@ -153,7 +154,19 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
};
this.moveFeed = function (feedId, folderId) {
+ var reload = false;
+ var feed = FeedResource.getById(feedId);
+
+ if (this.isFolderActive(feed.folderId) ||
+ this.isFolderActive(folderId)) {
+ reload = true;
+ }
+
FeedResource.move(feedId, folderId);
+
+ if (reload) {
+ $route.reload();
+ }
};
// TBD