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

Mangle __html in prop validation. #5297

Merged
merged 2 commits into from
Oct 27, 2015
Merged

Mangle __html in prop validation. #5297

merged 2 commits into from
Oct 27, 2015

Conversation

quadrupleslap
Copy link
Contributor

No description provided.

@@ -259,7 +259,7 @@ function assertValidProps(component, props) {
);
invariant(
typeof props.dangerouslySetInnerHTML === 'object' &&
'__html' in props.dangerouslySetInnerHTML,
keyOf({ __html: null }) in props.dangerouslySetInnerHTML,
Copy link
Contributor

Choose a reason for hiding this comment

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

Like this please:

var CHILDREN_PROP = keyOf({children: null});

@facebook-github-bot
Copy link

@quadrupleslap updated the pull request.

@zpao zpao added this to the 0.14.1 milestone Oct 27, 2015
@zpao
Copy link
Member

zpao commented Oct 27, 2015

Thanks! (and thanks for the review @syranide!). We'll put this into 0.14.1.

zpao added a commit that referenced this pull request Oct 27, 2015
Mangle __html in prop validation.
@zpao zpao merged commit 5178728 into facebook:master Oct 27, 2015
@zpao zpao mentioned this pull request Oct 28, 2015
4 tasks
zpao added a commit to zpao/react that referenced this pull request Oct 28, 2015
Mangle __html in prop validation.
(cherry picked from commit 5178728)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants