garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

merge new infos into existing array instead of replacing the array completely, prevents full tree refresh and scrollbar location loss (fix #342)

Browse Source
This commit is contained in:
Athou
2013-06-26 15:29:58 +02:00
parent 966a7f56a5
commit 7432bd510d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,7 @@ function($scope, $timeout, $stateParams, $window, $location, $state, $route, Cat
$timeout(function refreshTree() { $timeout(function refreshTree() {
AnalyticsService.track(); AnalyticsService.track();
CategoryService.init(function() { CategoryService.refresh(function() {
$timeout(refreshTree, 30000); $timeout(refreshTree, 30000);
}, function() { }, function() {
$timeout(refreshTree, 30000); $timeout(refreshTree, 30000);
@@ -746,7 +746,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
olderThan : olderThan || $scope.timestamp, olderThan : olderThan || $scope.timestamp,
read : true read : true
}, function() { }, function() {
CategoryService.init(function() { CategoryService.refresh(function() {
$scope.$emit('emitReload'); $scope.$emit('emitReload');
}); });
}); });

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

@@ -208,6 +208,13 @@ function($resource, $http) {
callback(data); callback(data);
}); });
}; };
res.refresh = function(callback) {
res.get(function(data) {
_.merge(res.subscriptions, data);
if (callback)
callback(data);
});
};
res.init(); res.init();
return res; return res;