summaryrefslogtreecommitdiffstats
path: root/js/app
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-04-03 23:53:30 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-04-03 23:53:42 +0200
commit4ab9494fc90d9131afd50048369b92c2e47a9b6a (patch)
tree1066a874b9fed2ab6f646349a0aafbf686321ee3 /js/app
parent2abf47a533e56d42262e5061b8ffa9234129b9c9 (diff)
only instantiate one itemcontroller, prevent tons of requests when autopaging, fix #498
Diffstat (limited to 'js/app')
-rw-r--r--js/app/controllers/feedcontroller.coffee8
-rw-r--r--js/app/controllers/itemcontroller.coffee10
2 files changed, 8 insertions, 10 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee
index ee8b9375f..43186e689 100644
--- a/js/app/controllers/feedcontroller.coffee
+++ b/js/app/controllers/feedcontroller.coffee
@@ -47,6 +47,14 @@ ActiveFeed, FeedType, $window) ->
@_$scope.starredBusinessLayer = @_starredBusinessLayer
@_$scope.unreadCountFormatter = @_unreadCountFormatter
+ @_$scope.edit = (feed) ->
+ feed.editing = true
+ feed.originalValue = feed.title
+
+ @_$scope.cancel = (feed) ->
+ feed.editing = false
+ feed.title = feed.originalValue
+
@_$scope.getTotalUnreadCount = =>
# also update title based on unreadcount
count = @_subscriptionsBusinessLayer.getUnreadCount(0)
diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index ee2fa7e82..f381baede 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -37,16 +37,6 @@ Language, AutoPageLoading, Compact) ->
@_$scope.itemBusinessLayer = @_itemBusinessLayer
@_$scope.feedBusinessLayer = @_feedBusinessLayer
- @_$scope.edit = (feedId) =>
- feed = @_feedModel.getById(feedId)
- feed.editing = true
- feed.originalValue = feed.title
-
- @_$scope.cancel = (feedId) =>
- feed = @_feedModel.getById(feedId)
- feed.editing = false
- feed.title = feed.originalValue
-
@_$scope.isLoading = =>
return @_feedLoading.isLoading()