Skip to content

fix(menus): Switching applyAsync for timeout. #6540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2018
Merged

fix(menus): Switching applyAsync for timeout. #6540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/js/core/directives/ui-grid-column-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/js/core/directives/ui-grid-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
Expand Down