mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Merge pull request #5692 from zpao/small-style-fixups
A couple small style fixups that were missed in recent PRs
This commit is contained in:
commit
9a6c5deeb6
2 files changed
+5
-6
No files matched your search
@@ -197,13 +197,12 @@ var ReactCompositeComponentMixin = {
|
||||
|
||||
var propsMutated = inst.props !== publicProps;
|
||||
var componentName =
|
||||
Component.displayName || Component.name || 'Component';
|
||||
Component.displayName || Component.name || 'Component';
|
||||
|
||||
warning(
|
||||
typeof inst.props === 'undefined' ||
|
||||
!propsMutated,
|
||||
typeof inst.props === 'undefined' || !propsMutated,
|
||||
'%s(...): When calling super() in `%s`, make sure to pass ' +
|
||||
'up the same props that your component\'s constructor was passed.',
|
||||
'up the same props that your component\'s constructor was passed.',
|
||||
componentName, componentName
|
||||
);
|
||||
}
|
||||
@@ -328,7 +327,7 @@ var ReactCompositeComponentMixin = {
|
||||
this._instance.state = this._processPendingState(this._instance.props, this._instance.context);
|
||||
}
|
||||
checkpoint = transaction.checkpoint();
|
||||
|
||||
|
||||
this._renderedComponent.unmountComponent();
|
||||
transaction.rollback(checkpoint);
|
||||
|
||||
|
||||
@@ -1193,7 +1193,7 @@ describe('ReactCompositeComponent', function() {
|
||||
expect(console.error.calls.length).toBe(1);
|
||||
expect(console.error.argsForCall[0][0]).toContain(
|
||||
'Foo(...): When calling super() in `Foo`, make sure to pass ' +
|
||||
'up the same props that your component\'s constructor was passed.'
|
||||
'up the same props that your component\'s constructor was passed.'
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user