Skip to content

Commit 43d6480

Browse files
committed
WIP
1 parent 0b660b5 commit 43d6480

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

misc/tutorial/102_sorting.ngdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data has changed by calling `gridApi.core.notifyDataChange( grid, uiGridUtils.da
2424

2525
<example module="app">
2626
<file name="app.js">
27-
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
27+
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);
2828

2929
app.controller('MainCtrl', ['$scope', '$http', 'uiGridConstants', function ($scope, $http, uiGridConstants) {
3030
$scope.gridOptions1 = {

misc/tutorial/210_selection.ngdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Two examples are provided, the first with rowHeaderSelection and multi-select, t
4141

4242
<example module="app">
4343
<file name="app.js">
44-
var app = angular.module('app', ['ui.grid', 'ui.grid.selection']);
44+
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.selection']);
4545

4646
app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
4747
$scope.gridOptions = {

misc/tutorial/305_externalScopes.ngdoc

+12-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Then in a template, you access the scope using getExternalScopes() function.
1919
@example
2020
<example module="app">
2121
<file name="app.js">
22-
var app = angular.module('app', ['ui.grid']);
22+
var app = angular.module('app', ['ngTouch', 'ui.grid']);
2323

24-
app.controller('MainCtrl', ['$scope', '$log', function ($scope, $log) {
24+
app.controller('MainCtrl', ['$scope', '$log', '$http', function ($scope, $log, $http) {
2525

2626
$scope.myViewModel = {
2727
someProp:'abc',
@@ -33,12 +33,12 @@ Then in a template, you access the scope using getExternalScopes() function.
3333
$scope.gridOptions = {};
3434

3535
$scope.gridOptions.columnDefs = [
36-
{ name: 'firstName' },
37-
{ name: 'lastName'},
36+
{ name: 'name' },
37+
{ name: 'gender'},
3838
{ name: 'ShowScope',
3939
cellTemplate:'<button class="btn primary" ng-click="getExternalScopes().showMe()">Click Me</button>' }
4040
];
41-
41+
/*
4242
$scope.gridOptions.data = [
4343
{
4444
"firstName": "Cox",
@@ -59,6 +59,13 @@ Then in a template, you access the scope using getExternalScopes() function.
5959
"employed": false
6060
}
6161
];
62+
*/
63+
64+
$http.get('/data/100.json')
65+
.success(function(data) {
66+
$scope.gridOptions.data = data;
67+
});
68+
6269
}]);
6370
</file>
6471
<file name="index.html">

misc/tutorial/306_expandable_grid.ngdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SubGrid nesting can be done upto multiple levels.
3333
@example
3434
<example module="app">
3535
<file name="app.js">
36-
var app = angular.module('app', ['ui.grid', 'ui.grid.expandable', 'ui.grid.selection', 'ui.grid.pinning']);
36+
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.expandable', 'ui.grid.selection', 'ui.grid.pinning']);
3737

3838
app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
3939
$scope.gridOptions = {

0 commit comments

Comments
 (0)