Skip to content
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.

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

fix(dialog): prevent error when restoring focus on IE #2771

Merged
merged 1 commit into from
Feb 1, 2017

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Jan 23, 2017

  • Adds an extra null check when restoring focus after a dialog is closed. This is necessary, because the document.activeElement can be null in IE.
  • Switches the focusing logic to use the Renderer.

Fixes #2760.

Note that this is missing a unit test, because it's hard to mock up the activeElement.

* Adds an extra null check when restoring focus after a dialog is closed. This is necessary, because the `document.activeElement` can be null in IE.
* Switches the focusing logic to use the `Renderer`.

Fixes angular#2760.
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jan 23, 2017
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

this._ngZone.onMicrotaskEmpty.first().subscribe(() => {
this._renderer.invokeElementMethod(this._elementFocusedBeforeDialogWasOpened, 'focus');
});
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: using the renderer is fine here, but not exactly necessary since closing a dialog would always be the result of a user action which can only happen once the app is running in the browser.

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Jan 23, 2017
@kara kara merged commit 153fcd3 into angular:master Feb 1, 2017
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error after closing dialog in IE if there was no active element when opening the dialog
4 participants