Skip to content

Commit b77ddc3

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
fix(resize-columns): Replace with
Also, updated tutorial page to match angular style guide standards.
1 parent 2d40955 commit b77ddc3

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

misc/tutorial/204_column_resizing.ngdoc

+8-6
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ $scope.gridOptions = {
5959
<file name="app.js">
6060
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.resizeColumns', 'ui.grid.moveColumns']);
6161

62-
app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
63-
$scope.gridOptions = {
62+
app.controller('MainCtrl', function ($scope, $http) {
63+
var vm = this;
64+
65+
vm.gridOptions = {
6466
enableSorting: true,
6567
columnDefs: [
6668
{ field: 'name', minWidth: 200, width: 250, enableColumnResizing: false },
@@ -71,19 +73,19 @@ $scope.gridOptions = {
7173

7274
$http.get('/data/100.json')
7375
.then(function(response) {
74-
$scope.gridOptions.data = response.data;
76+
vm.gridOptions.data = response.data;
7577
});
76-
}]);
78+
});
7779
</file>
7880
<file name="index.html">
79-
<div ng-controller="MainCtrl">
81+
<div ng-controller="MainCtrl as $ctrl">
8082
<strong>Drag</strong> a the column separator to resize; <strong>double-click</strong> to size according to rendered column contents.
8183
<br>
8284
<br>
8385
The column will obey any <i>minWidth</i> or <i>maxWidth</i> constraints you give it.
8486
<br>
8587
<br>
86-
<div ui-grid="gridOptions" class="grid" ui-grid-resize-columns ui-grid-move-columns></div>
88+
<div ui-grid="$ctrl.gridOptions" class="grid" ui-grid-resize-columns ui-grid-move-columns></div>
8789
</div>
8890
</file>
8991
<file name="main.css">

src/features/resize-columns/js/ui-grid-column-resizer.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
var module = angular.module('ui.grid.resizeColumns', ['ui.grid']);
1616

17-
module.service('uiGridResizeColumnsService', ['gridUtil', '$q', '$timeout',
18-
function (gridUtil, $q, $timeout) {
17+
module.service('uiGridResizeColumnsService', ['gridUtil', '$q', '$rootScope',
18+
function (gridUtil, $q, $rootScope) {
1919

2020
var service = {
2121
defaultGridOptions: function(gridOptions){
@@ -103,7 +103,7 @@
103103
},
104104

105105
fireColumnSizeChanged: function (grid, colDef, deltaChange) {
106-
$timeout(function () {
106+
$rootScope.$applyAsync(function () {
107107
if ( grid.api.colResizable ){
108108
grid.api.colResizable.raise.columnSizeChanged(colDef, deltaChange);
109109
} else {
@@ -190,7 +190,7 @@
190190
}]);
191191

192192
// Extend the uiGridHeaderCell directive
193-
module.directive('uiGridHeaderCell', ['gridUtil', '$templateCache', '$compile', '$q', 'uiGridResizeColumnsService', 'uiGridConstants', '$timeout', function (gridUtil, $templateCache, $compile, $q, uiGridResizeColumnsService, uiGridConstants, $timeout) {
193+
module.directive('uiGridHeaderCell', ['gridUtil', '$templateCache', '$compile', '$q', 'uiGridResizeColumnsService', 'uiGridConstants', function (gridUtil, $templateCache, $compile, $q, uiGridResizeColumnsService, uiGridConstants) {
194194
return {
195195
// Run after the original uiGridHeaderCell
196196
priority: -10,
@@ -244,8 +244,8 @@
244244

245245
displayResizers();
246246

247-
var waitDisplay = function(){
248-
$timeout(displayResizers);
247+
var waitDisplay = function() {
248+
$scope.$applyAsync(displayResizers);
249249
};
250250

251251
var dataChangeDereg = grid.registerDataChangeCallback( waitDisplay, [uiGridConstants.dataChange.COLUMN] );

0 commit comments

Comments
 (0)