Skip to content

Commit f77df14

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
fix(move-columns): Replace with .
Also, updated tutorial to follow angular styleguide standards.
1 parent 30af7e9 commit f77df14

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

misc/tutorial/217_column_moving.ngdoc

+15-14
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,24 @@ Columns can be repositioned by either dragging and dropping them to specific pos
2525
<example module="app">
2626
<file name="app.js">
2727
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.moveColumns']);
28-
app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
29-
$scope.gridOptions = {
28+
app.controller('MainCtrl', function ($scope, $http) {
29+
var vm = this;
30+
31+
vm.gridOptions = {
32+
columnDefs: [
33+
{ name: 'id'},
34+
{ name: 'name'},
35+
{ name: 'age'},
36+
{ name: 'gender'},
37+
{ name: 'email'},
38+
]
3039
};
3140

32-
$scope.gridOptions.columnDefs = [
33-
{ name: 'id'},
34-
{ name: 'name'},
35-
{ name: 'age'},
36-
{ name: 'gender'},
37-
{ name: 'email'},
38-
];
39-
4041
$http.get('/data/500_complex.json')
4142
.then(function(response) {
42-
$scope.gridOptions.data = response.data;
43+
vm.gridOptions.data = response.data;
4344
});
44-
}]);
45+
});
4546
</file>
4647
<file name="main.css">
4748
.grid {
@@ -50,8 +51,8 @@ Columns can be repositioned by either dragging and dropping them to specific pos
5051
}
5152
</file>
5253
<file name="index.html">
53-
<div ng-controller="MainCtrl">
54-
<div class="grid" ui-grid="gridOptions" ui-grid-move-columns></div>
54+
<div ng-controller="MainCtrl as $ctrl">
55+
<div class="grid" ui-grid="$ctrl.gridOptions" ui-grid-move-columns></div>
5556
</div>
5657
</file>
5758
</example>

src/features/move-columns/js/column-movable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @name ui.grid.moveColumns.service:uiGridMoveColumnService
2121
* @description Service for column moving feature.
2222
*/
23-
module.service('uiGridMoveColumnService', ['$q', '$timeout', '$log', 'ScrollEvent', 'uiGridConstants', 'gridUtil', function ($q, $timeout, $log, ScrollEvent, uiGridConstants, gridUtil) {
23+
module.service('uiGridMoveColumnService', ['$q', '$rootScope', '$log', 'ScrollEvent', 'uiGridConstants', 'gridUtil', function ($q, $rootScope, $log, ScrollEvent, uiGridConstants, gridUtil) {
2424

2525
var service = {
2626
initializeGrid: function (grid) {
@@ -202,7 +202,7 @@
202202
columns[newPosition] = originalColumn;
203203
service.updateColumnCache(grid);
204204
grid.queueGridRefresh();
205-
$timeout(function () {
205+
$rootScope.$applyAsync(function () {
206206
grid.api.core.notifyDataChange( uiGridConstants.dataChange.COLUMN );
207207
grid.api.colMovable.raise.columnPositionChanged(originalColumn.colDef, originalPosition, newPosition);
208208
});

0 commit comments

Comments
 (0)