summaryrefslogtreecommitdiffstats
path: root/js/app/controllers/feedcontroller.coffee
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-15 12:06:14 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-15 12:06:14 +0200
commit360966ab4bdafd15cdef21e34492f5d7d3151b74 (patch)
tree0d196a502d41a5234a2da5903fda09e7d51ddaed /js/app/controllers/feedcontroller.coffee
parentfe2bb06a2cc7bf3cd70388d6179728a600eabc9f (diff)
get language from server and save it in a language object, dont use a seperate file for instantiating controllers
Diffstat (limited to 'js/app/controllers/feedcontroller.coffee')
-rw-r--r--js/app/controllers/feedcontroller.coffee13
1 files changed, 9 insertions, 4 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee
index 8f9f4e7b6..e9171a455 100644
--- a/js/app/controllers/feedcontroller.coffee
+++ b/js/app/controllers/feedcontroller.coffee
@@ -21,9 +21,12 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory '_FeedController',
-['_ExistsError',
-(_ExistsError)->
+angular.module('News').controller 'FeedController',
+['$scope', '_ExistsError', 'Persistence', 'FolderBl', 'FeedBl',
+'SubscriptionsBl', 'StarredBl', 'unreadCountFormatter',
+($scope, _ExistsError, Persistence, FolderBl, FeedBl, SubscriptionsBl,
+StarredBl, unreadCountFormatter) ->
+
class FeedController
@@ -105,6 +108,8 @@ angular.module('News').factory '_FeedController',
@_$scope.$on 'moveFeedToFolder', (scope, data) =>
@_feedBl.move(data.feedId, data.folderId)
- return FeedController
+
+ return new FeedController($scope, Persistence, FolderBl, FeedBl,
+ SubscriptionsBl, StarredBl, unreadCountFormatter)
] \ No newline at end of file