fix(core/ui-grid): Updating to .

Improving performance by updating some timeout instances to .

Author: Portugal, Marcelo

misc/tutorial/121_grid_menu.ngdoc

@@ -46,7 +46,9 @@ In the meantime, you can override the height to fit with your application in you
   <file name="app.js">
     var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.exporter', 'ui.grid.selection']);
 
-    app.controller('MainCtrl', ['$scope', '$http', '$interval', '$q', function ($scope, $http, $interval, $q) {
+    app.controller('MainCtrl', function ($scope, $http, $interval, $q) {
+      var vm = this;
+
       function fakeI18n(title){
         return $q(function(resolve) {
           $interval(function() {
@@ -55,7 +57,7 @@ In the meantime, you can override the height to fit with your application in you
         });
       }
 
-      $scope.gridOptions = {
+      vm.gridOptions = {
         exporterMenuCsv: false,
         enableGridMenu: true,
         gridMenuTitleFilter: fakeI18n,
@@ -74,30 +76,30 @@ In the meantime, you can override the height to fit with your application in you
           }
         ],
         onRegisterApi: function( gridApi ){
-          $scope.gridApi = gridApi;
+          vm.gridApi = gridApi;
 
           // interval of zero just to allow the directive to have initialized
           $interval( function() {
             gridApi.core.addToGridMenu( gridApi.grid, [{ title: 'Dynamic item', order: 100}]);
           }, 0, 1);
 
           gridApi.core.on.columnVisibilityChanged( $scope, function( changedColumn ){
-            $scope.columnChanged = { name: changedColumn.colDef.name, visible: changedColumn.colDef.visible };
+            vm.columnChanged = { name: changedColumn.colDef.name, visible: changedColumn.colDef.visible };
           });
         }
       };
 
       $http.get('/data/100.json')
         .then(function(response) {
-          $scope.gridOptions.data = response.data;
+          vm.gridOptions.data = response.data;
         });
-    }]);
+    });
   </file>
   <file name="index.html">
-    <div ng-controller="MainCtrl">
-      <div id="grid1" ui-grid="gridOptions" ui-grid-exporter ui-grid-selection class="grid"></div>
-      <div ng-if='columnChanged'>
-        Column Visibility Changed - name: {{ columnChanged.name }} visible: {{ columnChanged.visible }}
+    <div ng-controller="MainCtrl as $ctrl">
+      <div id="grid1" ui-grid="$ctrl.gridOptions" ui-grid-exporter ui-grid-selection class="grid"></div>
+      <div ng-if="$ctrl.columnChanged">
+        Column Visibility Changed - name: {{ $ctrl.columnChanged.name }} visible: {{ $ctrl.columnChanged.visible }}
       </div>
     </div>
   </file>

src/js/core/directives/ui-grid-column-menu.js

@@ -438,7 +438,7 @@ function ($timeout, gridUtil, uiGridConstants, uiGridColumnMenuService, $documen
 
       //Since we are hiding this column the default hide action will fail so we need to focus somewhere else.
       var setFocusOnHideColumn = function(){
-        $timeout(function(){
+        $scope.$applyAsync(function() {
           // Get the UID of the first
           var focusToGridMenu = function(){
             return gridUtil.focus.byId('grid-menu', $scope.grid);

src/js/core/directives/ui-grid-header-cell.js

@@ -245,27 +245,17 @@
               }
               contents.addClass(classAdded);
 
-              $timeout(function (){
+              $scope.$applyAsync(function() {
                 var rightMostContainer = $scope.grid.renderContainers['right'] ? $scope.grid.renderContainers['right'] : $scope.grid.renderContainers['body'];
                 $scope.isLastCol = ( $scope.col === rightMostContainer.visibleColumnCache[ rightMostContainer.visibleColumnCache.length - 1 ] );
               });
 
               // Figure out whether this column is sortable or not
-              if ($scope.col.enableSorting) {
-                $scope.sortable = true;
-              }
-              else {
-                $scope.sortable = false;
-              }
+              $scope.sortable = Boolean($scope.col.enableSorting);
 
               // Figure out whether this column is filterable or not
               var oldFilterable = $scope.filterable;
-              if (uiGridCtrl.grid.options.enableFiltering && $scope.col.enableFiltering) {
-                $scope.filterable = true;
-              }
-              else {
-                $scope.filterable = false;
-              }
+              $scope.filterable = Boolean(uiGridCtrl.grid.options.enableFiltering && $scope.col.enableFiltering);
 
               if ( oldFilterable !== $scope.filterable){
                 if ( typeof($scope.col.updateFilters) !== 'undefined' ){

src/js/core/directives/ui-grid-menu.js

@@ -93,7 +93,7 @@ function ($compile, $timeout, $window, $document, gridUtil, uiGridConstants, i18
            */
           $scope.shown = true;
 
-          $timeout( function() {
+          $scope.$applyAsync(function() {
             $scope.shownMid = true;
             $scope.$emit('menu-shown');
           });
@@ -118,7 +118,6 @@ function ($compile, $timeout, $window, $document, gridUtil, uiGridConstants, i18
           angular.element(document).on(docEventType, applyHideMenu);
           $elm.on('keyup', checkKeyUp);
           $elm.on('keydown', checkKeyDown);
-
         });
         //automatically set the focus to the first button element in the now open menu.
         gridUtil.focus.bySelector($elm, 'button[type=button]', true);