Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2800 from jsfb/getDOMNode-becomes-findDOMNode

Browse Source 
Minor updates to findDOMNode, as per additional post-commit CR feedback.
This commit is contained in:
Jim
2015-01-05 13:29:14 -08:00
parent a7028c467f f507ba3c2b
commit 2a28189bea
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/__tests__/findDOMNode.-test.js
+2 -2
View File
@@ -42,8 +42,8 @@ describe('findDOMNode', function() {
it('findDOMNode should reject unmounted objects with render func', function() {
expect(function() {React.findDOMNode({render: function(){}});})
.toThrow('Invariant Violation: Component contains `render` ' +
'method but is not mounted in the DOM'
.toThrow('Invariant Violation: Component (with keys: render) ' +
'contains `render` method but is not mounted in the DOM'
);
});
src/browser/findDOMNode.js
+4 -4
View File
@@ -11,8 +11,6 @@
*/
"use strict";
var ReactComponent = require('ReactComponent');
var ReactInstanceMap = require('ReactInstanceMap');
var ReactMount = require('ReactMount');
@@ -36,8 +34,10 @@ function findDOMNode(componentOrElement) {
return ReactMount.getNodeFromInstance(componentOrElement);
}
invariant(
!(componentOrElement.render != null && typeof(componentOrElement.render) === 'function'),
'Component contains `render` method but is not mounted in the DOM',
componentOrElement.render == null ||
typeof(componentOrElement.render) !== 'function',
'Component (with keys: %s) contains `render` method '
+'but is not mounted in the DOM',
Object.keys(componentOrElement)
);
invariant(