diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-12-20 17:30:51 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-12-20 17:30:51 +0100 |
| commit | 0454021bc3e65dba6f2509498d0bcff26ff82a6d (patch) | |
| tree | e47c19832f864a5d2a06e0edb66e2d23599510ef /js/app | |
| parent | 67daf1074702f8ee8e0720c6f864bc4b8eb3780c (diff) | |
Revert "prevent multiple autopage requests, fix #201"
This reverts commit 67daf1074702f8ee8e0720c6f864bc4b8eb3780c.
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/services/businesslayer/businesslayer.coffee | 2 | ||||
| -rw-r--r-- | js/app/services/businesslayer/itembusinesslayer.coffee | 1 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 10 |
3 files changed, 3 insertions, 10 deletions
diff --git a/js/app/services/businesslayer/businesslayer.coffee b/js/app/services/businesslayer/businesslayer.coffee index f7b02baea..14d692084 100644 --- a/js/app/services/businesslayer/businesslayer.coffee +++ b/js/app/services/businesslayer/businesslayer.coffee @@ -27,11 +27,9 @@ angular.module('News').factory '_BusinessLayer', -> constructor: (@_activeFeed, @_persistence, @_itemModel, @_type, @_$rootScope) -> - @_preventAutopage = false load: (id) -> - @_preventAutopage = false @_$rootScope.$broadcast 'loadingNewItems' @_itemModel.clear() @_persistence.getItems @_type, id, 0, => diff --git a/js/app/services/businesslayer/itembusinesslayer.coffee b/js/app/services/businesslayer/itembusinesslayer.coffee index 82d19de8e..1382df190 100644 --- a/js/app/services/businesslayer/itembusinesslayer.coffee +++ b/js/app/services/businesslayer/itembusinesslayer.coffee @@ -106,7 +106,6 @@ StarredBusinessLayer, NewestItem) -> loadNext: (callback) -> - lowestItemId = @_itemModel.getLowestId() if lowestItemId != 0 @_persistence.getItems @_activeFeed.getType(), diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 1bbe754eb..176589e9c 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -30,7 +30,7 @@ $rootScope, $q) -> constructor: (@_request, @_feedLoading, @_autoPageLoading, @_newLoading, @_config, @_activeFeed, @_$rootScope) -> - @_preventUselessAutoPageRequest = false + init: -> ### @@ -64,16 +64,13 @@ $rootScope, $q) -> # show different loading signs if offset == 0 - @_preventUselessAutoPageRequest = false loading = @_feedLoading else loading = @_autoPageLoading # loading sign handling loading.increase() - successCallbackWrapper = (data) => - if data.items.length == 0 - @_preventUselessAutoPageRequest = true + successCallbackWrapper = (data) -> onSuccess(data) loading.decrease() failureCallbackWrapper = (data) -> @@ -88,8 +85,7 @@ $rootScope, $q) -> onSuccess: successCallbackWrapper onFailure: failureCallbackWrapper - if not @_preventUselessAutoPageRequest - @_request.get 'news_items', params + @_request.get 'news_items', params getNewItems: (type, id, lastModified, onSuccess) -> |