fix active feed and folder markup

2 files changed, 6 insertions, 4 deletions

diff --git a/js/build/app.js b/js/build/app.js
index 33c8b6ae3..69ddbc4ec 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -375,10 +375,12 @@ var $__build_47_app__ = function () {
             return $route.current && $route.current.$$route.type === FEED_TYPE.STARRED;
           };
           this.isFolderActive = function (folderId) {
-            return $route.current && $route.current.$$route.type === FEED_TYPE.FOLDER && $route.current.params.id === folderId;
+            return $route.current && $route.current.$$route.type === FEED_TYPE.FOLDER && $route.current.params.id === folderId + '';
           };
           this.isFeedActive = function (feedId) {
-            return $route.current && $route.current.$$route.type === FEED_TYPE.FEED && $route.current.params.id === feedId;
+            console.log(feedId);
+            console.log($route.current.params);
+            return $route.current && $route.current.$$route.type === FEED_TYPE.FEED && $route.current.params.id === feedId + '';
           };
           this.isAddingFolder = function () {
             return true;
diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index d91f14d88..8307b0e75 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -100,13 +100,13 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
     this.isFolderActive = (folderId) => {
         return $route.current &&
             $route.current.$$route.type === FEED_TYPE.FOLDER &&
-            $route.current.params.id === folderId;
+            $route.current.params.id === folderId + '';
     };
 
     this.isFeedActive = (feedId) => {
         return $route.current &&
             $route.current.$$route.type === FEED_TYPE.FEED &&
-            $route.current.params.id === feedId;
+            $route.current.params.id === feedId + '';
     };
 
     // TBD