From 136335fcba88fa0f202be90480a54c69cd90abae Mon Sep 17 00:00:00 2001
From: "Portugal, Marcelo" <Marcelo.Portugal@Kronos.com>
Date: Tue, 16 Jan 2018 14:41:16 -0500
Subject: [PATCH] fix(menus): Switching applyAsync for timeout.

Reverting my previous change.

fix #6533
---
 src/js/core/directives/ui-grid-column-menu.js | 4 ++--
 src/js/core/directives/ui-grid-menu.js        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/js/core/directives/ui-grid-column-menu.js b/src/js/core/directives/ui-grid-column-menu.js
index 424f7c207f..b0cabfb6cd 100644
--- a/src/js/core/directives/ui-grid-column-menu.js
+++ b/src/js/core/directives/ui-grid-column-menu.js
@@ -436,9 +436,9 @@ function ($timeout, gridUtil, uiGridConstants, uiGridColumnMenuService, $documen
         $scope.hideMenu();
       };
 
-      //Since we are hiding this column the default hide action will fail so we need to focus somewhere else.
+      // Since we are hiding this column the default hide action will fail so we need to focus somewhere else.
       var setFocusOnHideColumn = function(){
-        $scope.$applyAsync(function() {
+        $timeout(function() {
           // Get the UID of the first
           var focusToGridMenu = function(){
             return gridUtil.focus.byId('grid-menu', $scope.grid);
diff --git a/src/js/core/directives/ui-grid-menu.js b/src/js/core/directives/ui-grid-menu.js
index cda9def116..3a66e34b42 100644
--- a/src/js/core/directives/ui-grid-menu.js
+++ b/src/js/core/directives/ui-grid-menu.js
@@ -93,7 +93,8 @@ function ($compile, $timeout, $window, $document, gridUtil, uiGridConstants, i18
            */
           $scope.shown = true;
 
-          $scope.$applyAsync(function() {
+          // Must be a timeout in order to work properly in Firefox. Issue #6533
+          $timeout(function() {
             $scope.shownMid = true;
             $scope.$emit('menu-shown');
           });