From f77df14c6aef34d8a938acd437ffdf92f51df7db Mon Sep 17 00:00:00 2001
From: "Portugal, Marcelo" <Marcelo.Portugal@Kronos.com>
Date: Mon, 15 Jan 2018 17:00:23 -0500
Subject: [PATCH] fix(move-columns): Replace  with .

Also, updated tutorial to follow angular styleguide standards.
---
 misc/tutorial/217_column_moving.ngdoc         | 29 ++++++++++---------
 .../move-columns/js/column-movable.js         |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/misc/tutorial/217_column_moving.ngdoc b/misc/tutorial/217_column_moving.ngdoc
index 26ced37966..4f3371b502 100644
--- a/misc/tutorial/217_column_moving.ngdoc
+++ b/misc/tutorial/217_column_moving.ngdoc
@@ -25,23 +25,24 @@ Columns can be repositioned by either dragging and dropping them to specific pos
 <example module="app">
   <file name="app.js">
     var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.moveColumns']);
-    app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
-      $scope.gridOptions = {
+    app.controller('MainCtrl', function ($scope, $http) {
+      var vm = this;
+
+      vm.gridOptions = {
+        columnDefs: [
+          { name: 'id'},
+          { name: 'name'},
+          { name: 'age'},
+          { name: 'gender'},
+          { name: 'email'},
+        ]
       };
 
-      $scope.gridOptions.columnDefs = [
-        { name: 'id'},
-        { name: 'name'},
-        { name: 'age'},
-        { name: 'gender'},
-        { name: 'email'},
-      ];
-
       $http.get('/data/500_complex.json')
         .then(function(response) {
-          $scope.gridOptions.data = response.data;
+          vm.gridOptions.data = response.data;
         });
-    }]);
+    });
   </file>
   <file name="main.css">
     .grid {
@@ -50,8 +51,8 @@ Columns can be repositioned by either dragging and dropping them to specific pos
     }
   </file>
   <file name="index.html">
-    <div ng-controller="MainCtrl">
-    <div class="grid" ui-grid="gridOptions" ui-grid-move-columns></div>
+    <div ng-controller="MainCtrl as $ctrl">
+    <div class="grid" ui-grid="$ctrl.gridOptions" ui-grid-move-columns></div>
     </div>
   </file>
 </example>
diff --git a/src/features/move-columns/js/column-movable.js b/src/features/move-columns/js/column-movable.js
index 10aafcca5e..7d74883ab2 100644
--- a/src/features/move-columns/js/column-movable.js
+++ b/src/features/move-columns/js/column-movable.js
@@ -20,7 +20,7 @@
    *  @name ui.grid.moveColumns.service:uiGridMoveColumnService
    *  @description Service for column moving feature.
    */
-  module.service('uiGridMoveColumnService', ['$q', '$timeout', '$log', 'ScrollEvent', 'uiGridConstants', 'gridUtil', function ($q, $timeout, $log, ScrollEvent, uiGridConstants, gridUtil) {
+  module.service('uiGridMoveColumnService', ['$q', '$rootScope', '$log', 'ScrollEvent', 'uiGridConstants', 'gridUtil', function ($q, $rootScope, $log, ScrollEvent, uiGridConstants, gridUtil) {
 
     var service = {
       initializeGrid: function (grid) {
@@ -202,7 +202,7 @@
           columns[newPosition] = originalColumn;
           service.updateColumnCache(grid);
           grid.queueGridRefresh();
-          $timeout(function () {
+          $rootScope.$applyAsync(function () {
             grid.api.core.notifyDataChange( uiGridConstants.dataChange.COLUMN );
             grid.api.colMovable.raise.columnPositionChanged(originalColumn.colDef, originalPosition, newPosition);
           });