Skip to content

Fix ReactEmptyComponent disappearing and throwing in IE8 #1495

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
chenglou merged 1 commit into from
Jun 23, 2014
Merged

Fix ReactEmptyComponent disappearing and throwing in IE8 #1495

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
2 changes: 1 addition & 1 deletion src/browser/ui/ReactDefaultInjection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function inject() {
ReactInjection.DOMProperty.injectDOMPropertyConfig(HTMLDOMPropertyConfig);
ReactInjection.DOMProperty.injectDOMPropertyConfig(SVGDOMPropertyConfig);

ReactInjection.EmptyComponent.injectEmptyComponent(ReactDOM.script);
ReactInjection.EmptyComponent.injectEmptyComponent(ReactDOM.noscript);

ReactInjection.Updates.injectReconcileTransaction(
ReactComponentBrowserEnvironment.ReactReconcileTransaction
Expand Down
12 changes: 11 additions & 1 deletion src/browser/ui/dom/setInnerHTML.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,17 @@ if (ExecutionEnvironment.canUseDOM) {
node.parentNode.replaceChild(node, node);
}

if (html.match(/^[ \r\n\t\f]/)) {
// We also implement a workaround for non-visible tags disappearing into
// thin air on IE8, this only happens if there is no visible text
// in-front of the non-visible tags. Piggyback on the whitespace fix
// and simply check if any non-visible tags appear in the source.
if (html.match(/^[ \r\n\t\f]/) ||
html[0] === '<' && (
html.indexOf('<noscript') !== -1 ||
html.indexOf('<script') !== -1 ||
html.indexOf('<style') !== -1 ||
html.indexOf('<meta') !== -1 ||
html.indexOf('<link') !== -1)) {
// Recover leading whitespace by temporarily prepending any character.
// \uFEFF has the potential advantage of being zero-width/invisible.
node.innerHTML = '\uFEFF' + html;
Expand Down
6 changes: 3 additions & 3 deletions src/core/__tests__/ReactCompositeComponent-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('ReactCompositeComponent', function() {
.toBeDOMComponentWithTag('a');
});

it('should render null and false as a script tag under the hood', () => {
it('should render null and false as a noscript tag under the hood', () => {
var Component1 = React.createClass({
render: function() {
return null;
Expand All @@ -145,10 +145,10 @@ describe('ReactCompositeComponent', function() {
var instance2 = ReactTestUtils.renderIntoDocument(<Component2 />);
reactComponentExpect(instance1)
.expectRenderedChild()
.toBeDOMComponentWithTag('script');
.toBeDOMComponentWithTag('noscript');
reactComponentExpect(instance2)
.expectRenderedChild()
.toBeDOMComponentWithTag('script');
.toBeDOMComponentWithTag('noscript');
});

it('should still throw when rendering to undefined', () => {
Expand Down