diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-05 11:22:38 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-05 11:22:38 +0200 |
| commit | f8451ca565c07cfe42d5cf5a9d3d02cba4f2d773 (patch) | |
| tree | 18ad7d2e5bb804e28e3e5be122349d0bbbdbebc5 /js/app/controllers | |
| parent | 76b3dcd712b9bce4b94be58a07c8dbe584ee8f2f (diff) | |
bring back show all button
Diffstat (limited to 'js/app/controllers')
| -rw-r--r-- | js/app/controllers/controllers.coffee | 7 | ||||
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/js/app/controllers/controllers.coffee b/js/app/controllers/controllers.coffee index 6598ac692..77c178fef 100644 --- a/js/app/controllers/controllers.coffee +++ b/js/app/controllers/controllers.coffee @@ -30,11 +30,12 @@ angular.module('News').controller 'SettingsController', angular.module('News').controller 'FeedController', ['$scope', '_FeedController', 'Persistence', 'FolderBl', 'FeedBl', -'unreadCountFormatter', -($scope, _FeedController, Persistence, FolderBl, FeedBl, unreadCountFormatter)-> +'SubscriptionsBl', 'StarredBl', 'unreadCountFormatter', +($scope, _FeedController, Persistence, FolderBl, FeedBl, SubscriptionsBl, +StarredBl, unreadCountFormatter)-> return new _FeedController($scope, Persistence, FolderBl, FeedBl, - unreadCountFormatter) + SubscriptionsBl, StarredBl, unreadCountFormatter) ] angular.module('News').controller 'ItemController', diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 1438b4fbb..7785f3de6 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -26,7 +26,7 @@ angular.module('News').factory '_FeedController', -> class FeedController constructor: (@$scope, @_persistence, @_folderBl, @_feedBl, - @_unreadCountFormatter) -> + @_subscriptionsBl, @_starredBl, @_unreadCountFormatter) -> @_isAddingFolder = false @_isAddingFeed = false @@ -34,6 +34,8 @@ angular.module('News').factory '_FeedController', -> # bind internal stuff to scope @$scope.folderBl = @_folderBl @$scope.feedBl = @_feedBl + @$scope.subscriptionsBl = @_subscriptionsBl + @$scope.starredBl = @_starredBl @$scope.unreadCountFormatter = @_unreadCountFormatter |