[lint] fix consistent-returns

This commit is contained in:
Paul O’Shannessy
2015-01-13 15:26:33 -08:00
parent 2126600c37
commit 47ee780caf
10 changed files with 23 additions and 15 deletions
@@ -40,7 +40,7 @@ function typeCheckPass(declaration, value) {
'testComponent',
ReactPropTypeLocations.prop
);
expect(error).toBe(undefined);
expect(error).toBe(null);
}
describe('ReactLink', function() {
@@ -256,7 +256,7 @@ function extractCompositionEvent(
}
if (!eventType) {
return;
return null;
}
if (useFallbackCompositionData) {
@@ -427,7 +427,7 @@ function extractBeforeInputEvent(
// If no characters are being inserted, no BeforeInput event should
// be fired.
if (!chars) {
return;
return null;
}
var event = SyntheticInputEvent.getPooled(
@@ -95,7 +95,7 @@ function constructSelectEvent(nativeEvent) {
if (mouseDown ||
activeElement == null ||
activeElement !== getActiveElement()) {
return;
return null;
}
// Only fire when selection has actually changed.
+1 -1
View File
@@ -117,7 +117,7 @@ var TapEventPlugin = {
usedTouchTime = Date.now();
} else {
if (usedTouch && (Date.now() - usedTouchTime < TOUCH_DELAY)) {
return;
return null;
}
}
var event = null;
+2 -2
View File
@@ -123,7 +123,7 @@ var ReactEventListener = {
trapBubbledEvent: function(topLevelType, handlerBaseName, handle) {
var element = handle;
if (!element) {
return;
return null;
}
return EventListener.listen(
element,
@@ -145,7 +145,7 @@ var ReactEventListener = {
trapCapturedEvent: function(topLevelType, handlerBaseName, handle) {
var element = handle;
if (!element) {
return;
return null;
}
return EventListener.capture(
element,
@@ -81,7 +81,7 @@ var LinkedValueUtils = {
props.onChange ||
props.readOnly ||
props.disabled) {
return;
return null;
}
return new Error(
'You provided a `value` prop to a form field without an ' +
@@ -95,7 +95,7 @@ var LinkedValueUtils = {
props.onChange ||
props.readOnly ||
props.disabled) {
return;
return null;
}
return new Error(
'You provided a `checked` prop to a form field without an ' +
@@ -39,7 +39,7 @@ function updateOptionsIfPendingUpdateAndMounted() {
*/
function selectValueType(props, propName, componentName) {
if (props[propName] == null) {
return;
return null;
}
if (props.multiple) {
if (!Array.isArray(props[propName])) {
+11 -3
View File
@@ -98,6 +98,7 @@ function createChainableTypeChecker(validate) {
`\`${componentName}\`.`
);
}
return null;
} else {
return validate(props, propName, componentName, location);
}
@@ -125,12 +126,13 @@ function createPrimitiveTypeChecker(expectedType) {
`supplied to \`${componentName}\`, expected \`${expectedType}\`.`
);
}
return null;
}
return createChainableTypeChecker(validate);
}
function createAnyTypeChecker() {
return createChainableTypeChecker(emptyFunction.thatReturns());
return createChainableTypeChecker(emptyFunction.thatReturns(null));
}
function createArrayOfTypeChecker(typeChecker) {
@@ -150,6 +152,7 @@ function createArrayOfTypeChecker(typeChecker) {
return error;
}
}
return null;
}
return createChainableTypeChecker(validate);
}
@@ -163,6 +166,7 @@ function createElementTypeChecker() {
`\`${componentName}\`, expected a ReactElement.`
);
}
return null;
}
return createChainableTypeChecker(validate);
}
@@ -177,6 +181,7 @@ function createInstanceTypeChecker(expectedClass) {
`\`${componentName}\`, expected instance of \`${expectedClassName}\`.`
);
}
return null;
}
return createChainableTypeChecker(validate);
}
@@ -186,7 +191,7 @@ function createEnumTypeChecker(expectedValues) {
var propValue = props[propName];
for (var i = 0; i < expectedValues.length; i++) {
if (propValue === expectedValues[i]) {
return;
return null;
}
}
@@ -219,6 +224,7 @@ function createObjectOfTypeChecker(typeChecker) {
}
}
}
return null;
}
return createChainableTypeChecker(validate);
}
@@ -228,7 +234,7 @@ function createUnionTypeChecker(arrayOfTypeCheckers) {
for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
var checker = arrayOfTypeCheckers[i];
if (checker(props, propName, componentName, location) == null) {
return;
return null;
}
}
@@ -250,6 +256,7 @@ function createNodeChecker() {
`\`${componentName}\`, expected a ReactNode.`
);
}
return null;
}
return createChainableTypeChecker(validate);
}
@@ -275,6 +282,7 @@ function createShapeTypeChecker(shapeTypes) {
return error;
}
}
return null;
}
return createChainableTypeChecker(validate, 'expected `object`');
}
@@ -41,7 +41,7 @@ function typeCheckPass(declaration, value) {
'testComponent',
ReactPropTypeLocations.prop
);
expect(error).toBe(undefined);
expect(error).toBe(null);
}
describe('ReactPropTypes', function() {
+1 -1
View File
@@ -67,7 +67,7 @@ var ReactChildReconciler = {
// can quickly bailout if nothing has changed.
var nextChildren = flattenChildren(nextNestedChildNodes);
if (!nextChildren && !prevChildren) {
return;
return null;
}
var name;
for (name in nextChildren) {