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/public/app.js | |
parent | 67daf1074702f8ee8e0720c6f864bc4b8eb3780c (diff) |
Revert "prevent multiple autopage requests, fix #201"
This reverts commit 67daf1074702f8ee8e0720c6f864bc4b8eb3780c.
Diffstat (limited to 'js/public/app.js')
-rw-r--r-- | js/public/app.js | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/js/public/app.js b/js/public/app.js index c709dccab..e314695ca 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -1051,12 +1051,10 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. this._itemModel = _itemModel; this._type = _type; this._$rootScope = _$rootScope; - this._preventAutopage = false; } BusinessLayer.prototype.load = function(id) { var _this = this; - this._preventAutopage = false; this._$rootScope.$broadcast('loadingNewItems'); this._itemModel.clear(); this._persistence.getItems(this._type, id, 0, function() { @@ -2732,7 +2730,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. this._config = _config; this._activeFeed = _activeFeed; this._$rootScope = _$rootScope; - this._preventUselessAutoPageRequest = false; } Persistence.prototype.init = function() { @@ -2763,23 +2760,18 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. Persistence.prototype.getItems = function(type, id, offset, onSuccess) { - var failureCallbackWrapper, loading, params, successCallbackWrapper, - _this = this; + var failureCallbackWrapper, loading, params, successCallbackWrapper; if (onSuccess == null) { onSuccess = null; } onSuccess || (onSuccess = function() {}); if (offset === 0) { - this._preventUselessAutoPageRequest = false; loading = this._feedLoading; } else { loading = this._autoPageLoading; } loading.increase(); successCallbackWrapper = function(data) { - if (data.items.length === 0) { - _this._preventUselessAutoPageRequest = true; - } onSuccess(data); return loading.decrease(); }; @@ -2796,9 +2788,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. onSuccess: successCallbackWrapper, onFailure: failureCallbackWrapper }; - if (!this._preventUselessAutoPageRequest) { - return this._request.get('news_items', params); - } + return this._request.get('news_items', params); }; Persistence.prototype.getNewItems = function(type, id, lastModified, onSuccess) { |