Skip to content

Commit 6641b5b

Browse files
Jason TravisJLLeitschuh
authored andcommitted
docs(infinite-scroll): remove $q dependency and deprecated $http promises (#5364)
1 parent f5d4d8f commit 6641b5b

File tree

1 file changed

+16
-30
lines changed

1 file changed

+16
-30
lines changed

misc/tutorial/212_infinite_scroll.ngdoc

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Finally, we can reset the data, which gets us back to the middle page and sets t
6767
<file name="app.js">
6868
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.infiniteScroll']);
6969

70-
app.controller('MainCtrl', ['$scope', '$http', '$timeout', '$q', function ($scope, $http, $timeout, $q) {
70+
app.controller('MainCtrl', ['$scope', '$http', '$timeout', function ($scope, $http, $timeout) {
7171
$scope.gridOptions = {
7272
infiniteScrollRowsFromEnd: 40,
7373
infiniteScrollUp: true,
@@ -91,55 +91,41 @@ Finally, we can reset the data, which gets us back to the middle page and sets t
9191
$scope.lastPage = 2;
9292

9393
$scope.getFirstData = function() {
94-
var promise = $q.defer();
95-
$http.get('/data/10000_complex.json')
96-
.success(function(data) {
97-
var newData = $scope.getPage(data, $scope.lastPage);
94+
return $http.get('https://cdn.rawgit.com/angular-ui/ui-grid.info/gh-pages/data/10000_complex.json')
95+
.then(function(response) {
96+
var newData = $scope.getPage(response.data, $scope.lastPage);
9897
$scope.data = $scope.data.concat(newData);
99-
promise.resolve();
10098
});
101-
return promise.promise;
10299
};
103100

104101
$scope.getDataDown = function() {
105-
var promise = $q.defer();
106-
$http.get('/data/10000_complex.json')
107-
.success(function(data) {
102+
return $http.get('https://cdn.rawgit.com/angular-ui/ui-grid.info/gh-pages/data/10000_complex.json')
103+
.then(function(response) {
108104
$scope.lastPage++;
109-
var newData = $scope.getPage(data, $scope.lastPage);
105+
var newData = $scope.getPage(response.data, $scope.lastPage);
110106
$scope.gridApi.infiniteScroll.saveScrollPercentage();
111107
$scope.data = $scope.data.concat(newData);
112-
$scope.gridApi.infiniteScroll.dataLoaded($scope.firstPage > 0, $scope.lastPage < 4).then(function() {$scope.checkDataLength('up');}).then(function() {
113-
promise.resolve();
114-
});
108+
return $scope.gridApi.infiniteScroll.dataLoaded($scope.firstPage > 0, $scope.lastPage < 4).then(function() {$scope.checkDataLength('up');});
115109
})
116-
.error(function(error) {
117-
$scope.gridApi.infiniteScroll.dataLoaded();
118-
promise.reject();
110+
.catch(function(error) {
111+
return $scope.gridApi.infiniteScroll.dataLoaded();
119112
});
120-
return promise.promise;
121113
};
122114

123115
$scope.getDataUp = function() {
124-
var promise = $q.defer();
125-
$http.get('/data/10000_complex.json')
126-
.success(function(data) {
116+
return $http.get('https://cdn.rawgit.com/angular-ui/ui-grid.info/gh-pages/data/10000_complex.json')
117+
.then(function(response) {
127118
$scope.firstPage--;
128-
var newData = $scope.getPage(data, $scope.firstPage);
119+
var newData = $scope.getPage(response.data, $scope.firstPage);
129120
$scope.gridApi.infiniteScroll.saveScrollPercentage();
130121
$scope.data = newData.concat($scope.data);
131-
$scope.gridApi.infiniteScroll.dataLoaded($scope.firstPage > 0, $scope.lastPage < 4).then(function() {$scope.checkDataLength('down');}).then(function() {
132-
promise.resolve();
133-
});
122+
return $scope.gridApi.infiniteScroll.dataLoaded($scope.firstPage > 0, $scope.lastPage < 4).then(function() {$scope.checkDataLength('down');});
134123
})
135-
.error(function(error) {
136-
$scope.gridApi.infiniteScroll.dataLoaded();
137-
promise.reject();
124+
.catch(function(error) {
125+
return $scope.gridApi.infiniteScroll.dataLoaded();
138126
});
139-
return promise.promise;
140127
};
141128

142-
143129
$scope.getPage = function(data, page) {
144130
var res = [];
145131
for (var i = (page * 100); i < (page + 1) * 100 && i < data.length; ++i) {

0 commit comments

Comments
 (0)