From 47ee780cafa650a61bd62c4a6c13ac5554efd05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 13 Jan 2015 14:00:35 -0800 Subject: [PATCH] [lint] fix consistent-returns --- .../link/__tests__/ReactLinkPropTypes-test.js | 2 +- src/browser/eventPlugins/BeforeInputEventPlugin.js | 4 ++-- src/browser/eventPlugins/SelectEventPlugin.js | 2 +- src/browser/eventPlugins/TapEventPlugin.js | 2 +- src/browser/ui/ReactEventListener.js | 4 ++-- src/browser/ui/dom/components/LinkedValueUtils.js | 4 ++-- src/browser/ui/dom/components/ReactDOMSelect.js | 2 +- src/classic/types/ReactPropTypes.js | 14 +++++++++++--- src/classic/types/__tests__/ReactPropTypes-test.js | 2 +- src/core/ReactChildReconciler.js | 2 +- 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/addons/link/__tests__/ReactLinkPropTypes-test.js b/src/addons/link/__tests__/ReactLinkPropTypes-test.js index b57301d84c..76dadd39e8 100644 --- a/src/addons/link/__tests__/ReactLinkPropTypes-test.js +++ b/src/addons/link/__tests__/ReactLinkPropTypes-test.js @@ -40,7 +40,7 @@ function typeCheckPass(declaration, value) { 'testComponent', ReactPropTypeLocations.prop ); - expect(error).toBe(undefined); + expect(error).toBe(null); } describe('ReactLink', function() { diff --git a/src/browser/eventPlugins/BeforeInputEventPlugin.js b/src/browser/eventPlugins/BeforeInputEventPlugin.js index 6cd9cd539d..0441c57d0e 100644 --- a/src/browser/eventPlugins/BeforeInputEventPlugin.js +++ b/src/browser/eventPlugins/BeforeInputEventPlugin.js @@ -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( diff --git a/src/browser/eventPlugins/SelectEventPlugin.js b/src/browser/eventPlugins/SelectEventPlugin.js index 3eb304eb9f..7a93798c42 100644 --- a/src/browser/eventPlugins/SelectEventPlugin.js +++ b/src/browser/eventPlugins/SelectEventPlugin.js @@ -95,7 +95,7 @@ function constructSelectEvent(nativeEvent) { if (mouseDown || activeElement == null || activeElement !== getActiveElement()) { - return; + return null; } // Only fire when selection has actually changed. diff --git a/src/browser/eventPlugins/TapEventPlugin.js b/src/browser/eventPlugins/TapEventPlugin.js index 47b2521210..fe43085f2d 100644 --- a/src/browser/eventPlugins/TapEventPlugin.js +++ b/src/browser/eventPlugins/TapEventPlugin.js @@ -117,7 +117,7 @@ var TapEventPlugin = { usedTouchTime = Date.now(); } else { if (usedTouch && (Date.now() - usedTouchTime < TOUCH_DELAY)) { - return; + return null; } } var event = null; diff --git a/src/browser/ui/ReactEventListener.js b/src/browser/ui/ReactEventListener.js index 30c03562f5..41835ba928 100644 --- a/src/browser/ui/ReactEventListener.js +++ b/src/browser/ui/ReactEventListener.js @@ -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, diff --git a/src/browser/ui/dom/components/LinkedValueUtils.js b/src/browser/ui/dom/components/LinkedValueUtils.js index 3e0b5c97ff..c1235b13e3 100644 --- a/src/browser/ui/dom/components/LinkedValueUtils.js +++ b/src/browser/ui/dom/components/LinkedValueUtils.js @@ -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 ' + diff --git a/src/browser/ui/dom/components/ReactDOMSelect.js b/src/browser/ui/dom/components/ReactDOMSelect.js index 10e63517f2..aa41aeddf2 100644 --- a/src/browser/ui/dom/components/ReactDOMSelect.js +++ b/src/browser/ui/dom/components/ReactDOMSelect.js @@ -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])) { diff --git a/src/classic/types/ReactPropTypes.js b/src/classic/types/ReactPropTypes.js index ec691faed0..bdf31ef130 100644 --- a/src/classic/types/ReactPropTypes.js +++ b/src/classic/types/ReactPropTypes.js @@ -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`'); } diff --git a/src/classic/types/__tests__/ReactPropTypes-test.js b/src/classic/types/__tests__/ReactPropTypes-test.js index 3724dbf4e8..fe0ad4a340 100644 --- a/src/classic/types/__tests__/ReactPropTypes-test.js +++ b/src/classic/types/__tests__/ReactPropTypes-test.js @@ -41,7 +41,7 @@ function typeCheckPass(declaration, value) { 'testComponent', ReactPropTypeLocations.prop ); - expect(error).toBe(undefined); + expect(error).toBe(null); } describe('ReactPropTypes', function() { diff --git a/src/core/ReactChildReconciler.js b/src/core/ReactChildReconciler.js index addb416b21..47b11dca5f 100644 --- a/src/core/ReactChildReconciler.js +++ b/src/core/ReactChildReconciler.js @@ -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) {