Skip to content

Commit

Permalink
Merge pull request facebook#5056 from jimfb/reactdom-in-src
Browse files Browse the repository at this point in the history
React->ReactDOM in src/
  • Loading branch information
jimfb committed Oct 5, 2015
2 parents 94ccda8 + 5a9dea0 commit 870a15a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/renderers/dom/client/__tests__/ReactDOM-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('ReactDOM', function() {
return <form><input type="submit" value="Submit" /></form>;
},
componentDidMount: function() {
form = React.findDOMNode(this);
form = ReactDOM.findDOMNode(this);
}
});
var instance = ReactTestUtils.renderIntoDocument(<Parent />);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@ describe('ReactCompositeComponent', function() {
var Inner = React.createClass({
componentWillUnmount: function() {
// It's important that ReactMount.purgeID is called after any component
// lifecycle methods, because a componentWillMount implementation is
// likely to call React.findDOMNode(this), which will repopulate the
// lifecycle methods, because a componentWillUnmount implementation is
// likely to call ReactDOM.findDOMNode(this), which will repopulate the
// node cache after it's been cleared, causing a memory leak.
expect(ReactMount.purgeID.calls.length).toBe(0);
innerUnmounted = true;
Expand Down
2 changes: 1 addition & 1 deletion src/test/createHierarchyRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var React = require('React');
*
* var instances = renderHierarchy(
* function(ComponentA[, ComponentB, ComponentC]) {
* React.render(<ComponentA />, ...);
* ReactDOM.render(<ComponentA />, ...);
* })
* );
* instances[0][0]; // First return value of first render method.
Expand Down

0 comments on commit 870a15a

Please sign in to comment.