@@ -67,7 +67,7 @@ Finally, we can reset the data, which gets us back to the middle page and sets t
67
67
<file name="app.js">
68
68
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.infiniteScroll']);
69
69
70
- app.controller('MainCtrl', ['$scope', '$http', '$timeout', '$q', function ($scope, $http, $timeout, $q ) {
70
+ app.controller('MainCtrl', ['$scope', '$http', '$timeout', function ($scope, $http, $timeout) {
71
71
$scope.gridOptions = {
72
72
infiniteScrollRowsFromEnd: 40,
73
73
infiniteScrollUp: true,
@@ -91,55 +91,41 @@ Finally, we can reset the data, which gets us back to the middle page and sets t
91
91
$scope.lastPage = 2;
92
92
93
93
$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);
98
97
$scope.data = $scope.data.concat(newData);
99
- promise.resolve();
100
98
});
101
- return promise.promise;
102
99
};
103
100
104
101
$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) {
108
104
$scope.lastPage++;
109
- var newData = $scope.getPage(data, $scope.lastPage);
105
+ var newData = $scope.getPage(response. data, $scope.lastPage);
110
106
$scope.gridApi.infiniteScroll.saveScrollPercentage();
111
107
$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');});
115
109
})
116
- .error(function(error) {
117
- $scope.gridApi.infiniteScroll.dataLoaded();
118
- promise.reject();
110
+ .catch(function(error) {
111
+ return $scope.gridApi.infiniteScroll.dataLoaded();
119
112
});
120
- return promise.promise;
121
113
};
122
114
123
115
$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) {
127
118
$scope.firstPage--;
128
- var newData = $scope.getPage(data, $scope.firstPage);
119
+ var newData = $scope.getPage(response. data, $scope.firstPage);
129
120
$scope.gridApi.infiniteScroll.saveScrollPercentage();
130
121
$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');});
134
123
})
135
- .error(function(error) {
136
- $scope.gridApi.infiniteScroll.dataLoaded();
137
- promise.reject();
124
+ .catch(function(error) {
125
+ return $scope.gridApi.infiniteScroll.dataLoaded();
138
126
});
139
- return promise.promise;
140
127
};
141
128
142
-
143
129
$scope.getPage = function(data, page) {
144
130
var res = [];
145
131
for (var i = (page * 100); i < (page + 1) * 100 && i < data.length; ++i) {
0 commit comments