Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix infinity scroll

Browse Source
This commit is contained in:
Athou
2013-03-25 18:41:03 +01:00
parent 3b852d7743
commit 2c3a5274be
4 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/webapp/js/controllers.js
View File

@@ -104,29 +104,34 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http,
$scope.limit = 10;
$scope.busy = false;
$scope.hasMore = true;
$scope.refreshList = function() {
if ($scope.settings.readingMode) {
$scope.entryList = EntryService.get({
_type : $scope.selectedType,
_id : $scope.selectedId,
_readtype : $scope.settings.readingMode,
type : $scope.selectedType,
id : $scope.selectedId,
readType : $scope.settings.readingMode,
offset : 0,
limit : $scope.limit
limit : 30
});
}
};
$scope.loadMoreEntries = function() {
if(!$scope.hasMore)
return;
if (!$scope.entryList || !$scope.entryList.entries)
return;
if ($scope.busy)
return;
if (!$scope.settings.readingMode)
return;
$scope.busy = true;
EntryService.get({
_type : $scope.selectedType,
_id : $scope.selectedId,
_readtype : $scope.settings.readingMode,
type : $scope.selectedType,
id : $scope.selectedId,
readType : $scope.settings.readingMode,
offset : $scope.entryList.entries.length,
limit : $scope.limit
}, function(data) {
@@ -135,9 +140,8 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http,
for ( var i = 0; i < entries.length; i++) {
$scope.entryList.entries.push(entries[i]);
}
console.log(entries.length)
console.log($scope.limit)
$scope.busy = false;
$scope.hasMore = entries.length == $scope.limit
});
}

2
src/main/webapp/js/services.js
View File

@@ -78,7 +78,7 @@ module.factory('EntryService', [
}
}
};
res = $resource('rest/entries/:_method/:_type/:_id/:_readtype', {},
res = $resource('rest/entries/:_method', {},
actions);
return res;
} ]);

4
src/main/webapp/templates/feeds.html
View File

@@ -2,8 +2,8 @@
{{readType}}
<span>{{entryList.name}}</span><span
ng-show="selectedType == 'category'"> &#187;</span>
<div id="feed-accordion" infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy" infinite-scroll-distance="1">
<div ng-repeat="entry in entryList.entries">
<div class="accordion" id="feed-accordion" infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy" infinite-scroll-distance="1">
<div ng-repeat="entry in entryList.entries" class="entry">
<div class="entry-heading">
<a class="accordion-toggle" data-toggle="collapse"
ng-click="mark(entry, true)"