only get route id if route with an id is present

1 files changed, 7 insertions, 5 deletions

diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index 217422a7a..9a103df0b 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -15,6 +15,10 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
     this.feedError = '';
     this.folderError = '';
 
+    var getRouteId = function () {
+        return parseInt($route.current.params.id, 10);
+    };
+
     this.getFeeds = function () {
         return FeedResource.getAll();
     };
@@ -82,7 +86,7 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
         var type = $route.current.$$route.type;
 
         if (type === FEED_TYPE.FEED) {
-            var feed = FeedResource.getById($route.current.params.id);
+            var feed = FeedResource.getById(getRouteId());
 
             if (feed !== undefined && feed.folderId === folderId) {
                 return true;
@@ -103,17 +107,15 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
     };
 
     this.isFolderActive = function (folderId) {
-        var currentId = parseInt($route.current.params.id, 10);
         return $route.current &&
             $route.current.$$route.type === FEED_TYPE.FOLDER &&
-            currentId === folderId;
+            getRouteId() === folderId;
     };
 
     this.isFeedActive = function (feedId) {
-        var currentId = parseInt($route.current.params.id, 10);
         return $route.current &&
             $route.current.$$route.type === FEED_TYPE.FEED &&
-            currentId === feedId;
+            getRouteId() === feedId;
     };
 
     this.folderNameExists = function (folderName) {