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(menu,toolbar): avoid potential server-side rendering errors #9423

Merged
merged 1 commit into from
Jan 24, 2018

Conversation

crisbeto
Copy link
Member

Avoids a couple of potential server-side rendering errors due to the menu item and toolbar components referring to the Node global variable directly.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jan 16, 2018
@@ -105,6 +112,7 @@ export class MatMenuItem extends _MatMenuItemMixinBase
/** Gets the label to be used when determining whether the option should be focused. */
getLabel(): string {
const element: HTMLElement = this._elementRef.nativeElement;
const textNodeType = this._document ? this._document.TEXT_NODE : 3;
Copy link
Member

Choose a reason for hiding this comment

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

Make constants for node types until _document is always available?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm inclined not to, because we'll end up sprinkling them everywhere and it'll make it more likely to forget about removing them.

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, fair enough

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Jan 16, 2018
@crisbeto crisbeto added the target: minor This PR is targeted for the next minor release label Jan 17, 2018
@jelbourn
Copy link
Member

@crisbeto passes presubmit, just needs rebease

Avoids a couple of potential server-side rendering errors due to the menu item and toolbar components referring to the `Node` global variable directly.
@crisbeto crisbeto force-pushed the menu-toolbar-global-variables branch from 8f85a26 to b88f0ae Compare January 23, 2018 17:58
@crisbeto
Copy link
Member Author

Rebased.

@jelbourn jelbourn merged commit dfa68db into angular:master Jan 24, 2018
constructor(
elementRef: ElementRef,
private _platform: Platform,
@Inject(DOCUMENT) document?: any) {
Copy link
Contributor

Choose a reason for hiding this comment

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

@crisbeto I know this PR has already been merged, but shouldn't this have @deletion-target x.y.z as in others constructor parameters?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we had the tooling around @deletion-target when I first did this PR.

@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 8, 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 target: minor This PR is targeted for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants