diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-20 16:11:56 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-20 16:11:56 +0200 |
| commit | 43448880561846bf0c71f0b8836500a3cb8017c9 (patch) | |
| tree | 0ec1e354f1662782e355d3c07cc6a9a0523bec2d /js/app | |
| parent | f15d7d26e51503edc4a41edfdddee92a2aff8a19 (diff) | |
update all feeds in one go and dont trigger serverside update anymore on feedupdate, fix #90
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/app.coffee | 8 | ||||
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 6 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 19 |
3 files changed, 16 insertions, 17 deletions
diff --git a/js/app/app.coffee b/js/app/app.coffee index 264078b57..bf2ab08ec 100644 --- a/js/app/app.coffee +++ b/js/app/app.coffee @@ -26,7 +26,7 @@ angular.module('News', ['OC', 'ui']).config ($provide) -> $provide.value 'Config', config = markReadTimeout: 500 scrollTimeout: 500 - feedUpdateInterval: 600000 + feedUpdateInterval: 1000*60*10 itemBatchSize: 20 # the autoPageFactor defines how many heights of the box must be left # before it starts autopaging e.g. if it was 2, then it will start @@ -34,13 +34,13 @@ angular.module('News', ['OC', 'ui']).config ($provide) -> autoPageFactor: 6 -angular.module('News').run ['Persistence', 'Config', 'FeedBusinessLayer', -(Persistence, Config, FeedBusinessLayer) -> +angular.module('News').run ['Persistence', 'Config', +(Persistence, Config) -> Persistence.init() setInterval -> - FeedBusinessLayer.updateFeeds() + Persistence.getAllFeeds() , Config.feedUpdateInterval ] diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index a2fa0df3e..0ad81d875 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -166,12 +166,6 @@ FeedModel, NewLoading, _ExistsError, Utils) -> @_feedModel.removeByUrl(url) - updateFeeds: -> - for feed in @_feedModel.getAll() - if angular.isDefined(feed.id) - @_persistence.updateFeed(feed.id) - - importGoogleReader: (json) -> url = 'http://owncloud/googlereader' # hardcoded diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 88d1d18cc..a5a6bc092 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -156,16 +156,21 @@ $rootScope) -> ### FEED CONTROLLER ### - getAllFeeds: (onSuccess) -> + getAllFeeds: (onSuccess, showLoading=true) -> onSuccess or= -> # loading sign handling - @_feedLoading.increase() - successCallbackWrapper = (data) => - onSuccess() - @_feedLoading.decrease() - failureCallbackWrapper = (data) => - @_feedLoading.decrease() + if showLoading + @_feedLoading.increase() + successCallbackWrapper = (data) => + onSuccess() + @_feedLoading.decrease() + failureCallbackWrapper = (data) => + @_feedLoading.decrease() + else + successCallbackWrapper = (data) => + onSuccess() + failureCallbackWrapper = (data) => params = onSuccess: successCallbackWrapper |