diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-26 18:27:30 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-26 18:27:30 +0100 |
commit | eff408710b708a44cf3869599985fd8246c0400b (patch) | |
tree | b276ae04f8c1c8bd2b336d7ac925abe4d621dab5 /js | |
parent | a5cb76f49169a360c9c08d617f93b549a1ba62f0 (diff) |
fixed setting of active feed
Diffstat (limited to 'js')
-rw-r--r-- | js/app/controllers/feedcontroller.coffee | 2 | ||||
-rw-r--r-- | js/public/app.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index a8be616d9..1c04cd92e 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -131,7 +131,7 @@ angular.module('News').factory '_FeedController', -> isFeedActive: (type, id) -> - return type == @_active.getType() and id = @_active.getId() + return type == @_active.getType() and id == @_active.getId() isShown: (type, id) -> diff --git a/js/public/app.js b/js/public/app.js index 6a110adc7..eade23a4e 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -209,6 +209,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. this.$scope.folders = this._folderModel.getAll(); this.$scope.feedType = this._feedType; this.$scope.isFeedActive = function(type, id) { + console.log(type + ' ' + id); + console.log(_this.isFeedActive(type, id)); return _this.isFeedActive(type, id); }; this.$scope.isShown = function(type, id) { @@ -314,7 +316,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. }; FeedController.prototype.isFeedActive = function(type, id) { - return type === this._active.getType() && (id = this._active.getId()); + return type === this._active.getType() && id === this._active.getId(); }; FeedController.prototype.isShown = function(type, id) { |