summaryrefslogtreecommitdiffstats
path: root/js/controller
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-12 02:07:01 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-12 02:07:01 +0200
commitaee7a83449230f8835c6d98838c565303b633fc1 (patch)
treeb6a32c6d6aeda6c996b7bd75bc07cb4fc94f1dcb /js/controller
parent6f68f42535cb84bc9e28848cfc4f72cd53f2141d (diff)
add styling for error, disable draggable on error
Diffstat (limited to 'js/controller')
-rw-r--r--js/controller/NavigationController.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index ba09f630a..38594149a 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -126,6 +126,8 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
FeedResource.create(feed.url, feed.folderId, undefined)
.then(function (data) {
Publisher.publishAll(data);
+
+ // load created feed
$location.path('/items/feeds/' + data.id);
});
} else {
@@ -157,6 +159,10 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
var reload = false;
var feed = FeedResource.getById(feedId);
+ if (feed.folderId === folderId) {
+ return;
+ }
+
if (this.isFolderActive(feed.folderId) ||
this.isFolderActive(folderId)) {
reload = true;