summaryrefslogtreecommitdiffstats
path: root/js/app/controllers/feedcontroller.coffee
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-16 16:59:38 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-16 16:59:38 +0200
commit43ca6673b479695a84c77bc48bd27655ed6c93b9 (patch)
treeb2fa1dc71d3d6fd2afc12497605f219ed4df9446 /js/app/controllers/feedcontroller.coffee
parent3b425b0a46ae89e9ef0127b35563572238a1dc1c (diff)
unescape title to not escape html characters, this is handled by angularjs
Diffstat (limited to 'js/app/controllers/feedcontroller.coffee')
-rw-r--r--js/app/controllers/feedcontroller.coffee13
1 files changed, 8 insertions, 5 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee
index 3d8755cad..88a5d1c88 100644
--- a/js/app/controllers/feedcontroller.coffee
+++ b/js/app/controllers/feedcontroller.coffee
@@ -24,16 +24,18 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
angular.module('News').controller 'FeedController',
['$scope', '_ExistsError', 'Persistence', 'FolderBusinessLayer',
'FeedBusinessLayer', 'SubscriptionsBusinessLayer', 'StarredBusinessLayer',
-'unreadCountFormatter',
+'unreadCountFormatter', 'ActiveFeed', 'FeedType',
($scope, _ExistsError, Persistence, FolderBusinessLayer, FeedBusinessLayer,
-SubscriptionsBusinessLayer, StarredBusinessLayer, unreadCountFormatter) ->
+SubscriptionsBusinessLayer, StarredBusinessLayer, unreadCountFormatter,
+ActiveFeed, FeedType) ->
class FeedController
constructor: (@_$scope, @_persistence, @_folderBusinessLayer,
@_feedBusinessLayer, @_subscriptionsBusinessLayer,
- @_starredBusinessLayer, @_unreadCountFormatter) ->
+ @_starredBusinessLayer, @_unreadCountFormatter,
+ @_activeFeed, @_feedType) ->
@_isAddingFolder = false
@_isAddingFeed = false
@@ -45,7 +47,6 @@ SubscriptionsBusinessLayer, StarredBusinessLayer, unreadCountFormatter) ->
@_$scope.starredBusinessLayer = @_starredBusinessLayer
@_$scope.unreadCountFormatter = @_unreadCountFormatter
-
@_$scope.isAddingFolder = =>
return @_isAddingFolder
@@ -111,8 +112,10 @@ SubscriptionsBusinessLayer, StarredBusinessLayer, unreadCountFormatter) ->
@_feedBusinessLayer.move(data.feedId, data.folderId)
+
return new FeedController($scope, Persistence, FolderBusinessLayer,
FeedBusinessLayer, SubscriptionsBusinessLayer,
- StarredBusinessLayer, unreadCountFormatter)
+ StarredBusinessLayer, unreadCountFormatter,
+ ActiveFeed, FeedType)
] \ No newline at end of file