diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-31 02:16:57 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-31 02:16:57 +0200 |
commit | 123e146215f3d59c9b197d7eb9e739f058ee3719 (patch) | |
tree | 56da4be2480fb02ef42ec8553f9f61fcfc3a44e2 /js | |
parent | 2defc2863ecc63e224648a02d5e5dbf92344c337 (diff) |
fix active feed and folder markup
Diffstat (limited to 'js')
-rw-r--r-- | js/build/app.js | 6 | ||||
-rw-r--r-- | js/controller/NavigationController.js | 4 |
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 |