more stuff

2 files changed, 10 insertions, 7 deletions

diff --git a/js/app/Config.js b/js/app/Config.js
index 772547178..986699090 100644
--- a/js/app/Config.js
+++ b/js/app/Config.js
@@ -99,9 +99,6 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
             templateUrl: 'content.html',
             resolve: getResolve(feedType.FOLDER),
             type: feedType.FOLDER
-        })
-        .otherwise({
-            redirectTo: '/items'
         });
 
 });
diff --git a/js/app/Run.js b/js/app/Run.js
index c103a6e77..e119f0464 100644
--- a/js/app/Run.js
+++ b/js/app/Run.js
@@ -31,17 +31,18 @@ app.run(($rootScope, $location, $http, $q, $interval, Loading, ItemResource,
     });
 
     let activeFeedDeferred = $q.defer();
+    let path = $location.path();
     $http.get(`${BASE_URL}/feeds/active`).success((data) => {
         let 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:
@@ -52,7 +53,12 @@ app.run(($rootScope, $location, $http, $q, $interval, Loading, ItemResource,
             url = '/items';
         }
 
-        $location.path(url);
+        // only redirect if url is empty or faulty
+        // TODO check for faulty url
+        if (path === '') {
+            $location.path(url);
+        }
+
         activeFeedDeferred.resolve();
     });