Fix confusing variable names (#7863)
Toru Kobayashi committed
Oct 4, 2016 at 20:53 UTC
30067fa8caa829cc4470925ceb0687c1698ca277
1 file changed
+12
-12
src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+12
-12
@@ -1038,58 +1038,58 @@ var ReactCompositeComponent = {
1038
*/
1039
_renderValidatedComponentWithoutOwnerOrContext: function() {
1040
var inst = this._instance;
1041
- var renderedComponent;
1041
+ var renderedElement;
1042
1043
if (__DEV__) {
1044
- renderedComponent = measureLifeCyclePerf(
1044
+ renderedElement = measureLifeCyclePerf(
1045
() => inst.render(),
1046
this._debugID,
1047
'render'
1048
);
1049
} else {
1050
- renderedComponent = inst.render();
1050
+ renderedElement = inst.render();
1051
}
1052
1053
if (__DEV__) {
1054
// We allow auto-mocks to proceed as if they're returning null.
1055
- if (renderedComponent === undefined &&
1055
+ if (renderedElement === undefined &&
1056
inst.render._isMockFunction) {
1057
// This is probably bad practice. Consider warning here and
1058
// deprecating this convenience.
1059
- renderedComponent = null;
1059
+ renderedElement = null;
1060
}
1061
}
1062
1063
- return renderedComponent;
1063
+ return renderedElement;
1064
},
1065
1066
/**
1067
* @private
1068
*/
1069
_renderValidatedComponent: function() {
1070
- var renderedComponent;
1070
+ var renderedElement;
1071
if (__DEV__ || this._compositeType !== CompositeTypes.StatelessFunctional) {
1072
ReactCurrentOwner.current = this;
1073
try {
1074
- renderedComponent =
1074
+ renderedElement =
1075
this._renderValidatedComponentWithoutOwnerOrContext();
1076
} finally {
1077
ReactCurrentOwner.current = null;
1078
}
1079
} else {
1080
- renderedComponent =
1080
+ renderedElement =
1081
this._renderValidatedComponentWithoutOwnerOrContext();
1082
}
1083
invariant(
1084
// TODO: An `isValidNode` function would probably be more appropriate
1085
- renderedComponent === null || renderedComponent === false ||
1086
- React.isValidElement(renderedComponent),
1085
+ renderedElement === null || renderedElement === false ||
1086
+ React.isValidElement(renderedElement),
1087
'%s.render(): A valid React element (or null) must be returned. You may have ' +
1088
'returned undefined, an array or some other invalid object.',
1089
this.getName() || 'ReactCompositeComponent'
1090
);
1091
1092
- return renderedComponent;
1092
+ return renderedElement;
1093
},
1094
1095
/**