Skip to content

Commit 6602fbe

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
chore(401_AllFeatures.ngdoc): Fixing console error.
Updating All Features tutorial to follow angular styleguide and prevent console error with request.
1 parent 924cd9b commit 6602fbe

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

misc/tutorial/401_AllFeatures.ngdoc

+18-17
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ All features are enabled to get an idea of performance
1313
<file name="app.js">
1414
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.cellNav', 'ui.grid.edit', 'ui.grid.resizeColumns', 'ui.grid.pinning', 'ui.grid.selection', 'ui.grid.moveColumns', 'ui.grid.exporter', 'ui.grid.importer', 'ui.grid.grouping']);
1515

16-
app.controller('MainCtrl', ['$scope', '$http', '$timeout', '$interval', 'uiGridConstants', 'uiGridGroupingConstants',
16+
app.controller('MainCtrl',
1717
function ($scope, $http, $timeout, $interval, uiGridConstants, uiGridGroupingConstants) {
18-
var gridApi;
18+
var vm = this,
19+
gridApi;
1920

20-
$scope.gridOptions = {
21+
vm.gridOptions = {
2122
data: 'myData',
2223
enableCellEditOnFocus: true,
2324
enableColumnResizing: true,
@@ -60,26 +61,26 @@ All features are enabled to get an idea of performance
6061
return row.id;
6162
}
6263

63-
$scope.toggleFilterRow = function() {
64-
$scope.gridOptions.enableFiltering = !$scope.gridOptions.enableFiltering;
64+
vm.toggleFilterRow = function() {
65+
vm.gridOptions.enableFiltering = !vm.gridOptions.enableFiltering;
6566
gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN);
6667
};
6768

68-
$scope.callsPending = 0;
69+
vm.callsPending = 0;
6970

7071
var i = 0;
71-
$scope.refreshData = function(){
72+
vm.refreshData = function(){
7273
$scope.myData = [];
7374

7475
var start = new Date();
7576
var sec = $interval(function () {
76-
$scope.callsPending++;
77+
vm.callsPending++;
7778

7879
$http.get('/data/500_complex.json')
7980
.then(function(response) {
8081
var data = response.data;
8182

82-
$scope.callsPending--;
83+
vm.callsPending--;
8384

8485
data.forEach(function(row){
8586
row.id = i;
@@ -88,33 +89,33 @@ All features are enabled to get an idea of performance
8889
$scope.myData.push(row);
8990
});
9091
})
91-
.error(function() {
92-
$scope.callsPending--
92+
.catch(function() {
93+
vm.callsPending--;
9394
});
9495
}, 200, 10);
9596

9697

9798
var timeout = $timeout(function() {
9899
$interval.cancel(sec);
99-
$scope.left = '';
100+
vm.left = '';
100101
}, 2000);
101102

102103
$scope.$on('$destroy', function(){
103104
$timeout.cancel(timeout);
104105
$interval.cancel(sec);
105106
});
106107
};
107-
}]);
108+
});
108109
</file>
109110
<file name="index.html">
110-
<div ng-controller="MainCtrl">
111-
<button id="filterToggle" type="button" class="btn btn-success" ng-click="toggleFilterRow()">Toggle Filter</button>
112-
<button id="refreshButton" type="button" class="btn btn-success" ng-click="refreshData()">Refresh Data</button> <strong>Calls Pending:</strong> <span ng-bind="callsPending"></span>
111+
<div ng-controller="MainCtrl as $ctrl">
112+
<button id="filterToggle" type="button" class="btn btn-success" ng-click="$ctrl.toggleFilterRow()">Toggle Filter</button>
113+
<button id="refreshButton" type="button" class="btn btn-success" ng-click="$ctrl.refreshData()">Refresh Data</button> <strong>Calls Pending:</strong> <span ng-bind="$ctrl.callsPending"></span>
113114
<br>
114115
<br>
115116
<strong>{{ myData.length }} rows</strong>
116117
<br>
117-
<div id="grid1" ui-grid="gridOptions" ui-grid-cellNav ui-grid-edit ui-grid-resize-columns ui-grid-pinning ui-grid-selection ui-grid-move-columns ui-grid-importer ui-grid-exporter ui-grid-grouping class="grid"></div>
118+
<div id="grid1" ui-grid="$ctrl.gridOptions" ui-grid-cellNav ui-grid-edit ui-grid-resize-columns ui-grid-pinning ui-grid-selection ui-grid-move-columns ui-grid-importer ui-grid-exporter ui-grid-grouping class="grid"></div>
118119
</div>
119120
</file>
120121
<file name="main.css">

0 commit comments

Comments
 (0)