Merge pull request #5611 from dittos/irc-remove-2ndarg

Clean up caller sites of instantiateReactComponent
This commit is contained in:
Jim
2015-12-06 05:01:15 -08:00
3 changed files with 4 additions and 7 deletions
+1 -1
View File
@@ -330,7 +330,7 @@ var ReactMount = {
);
ReactBrowserEventEmitter.ensureScrollValueMonitoring();
var componentInstance = instantiateReactComponent(nextElement, null);
var componentInstance = instantiateReactComponent(nextElement);
// The initial render is synchronous but any updates that happen during
// rendering, in componentWillMount or componentDidMount, will be batched
@@ -41,7 +41,7 @@ function renderToStringImpl(element, makeStaticMarkup) {
transaction = ReactServerRenderingTransaction.getPooled(makeStaticMarkup);
return transaction.perform(function() {
var componentInstance = instantiateReactComponent(element, null);
var componentInstance = instantiateReactComponent(element);
var markup = componentInstance.mountComponent(
transaction,
null,
@@ -32,7 +32,7 @@ function instantiateChild(childInstances, child, name) {
);
}
if (child != null && keyUnique) {
childInstances[name] = instantiateReactComponent(child, null);
childInstances[name] = instantiateReactComponent(child);
}
}
@@ -101,10 +101,7 @@ var ReactChildReconciler = {
ReactReconciler.unmountComponent(prevChild, name);
}
// The child must be instantiated before it's mounted.
var nextChildInstance = instantiateReactComponent(
nextElement,
null
);
var nextChildInstance = instantiateReactComponent(nextElement);
nextChildren[name] = nextChildInstance;
}
}