[lint] fix consistent-returns
Paul O’Shannessy committed
Jan 13, 2015 at 14:00 UTC
47ee780cafa650a61bd62c4a6c13ac5554efd05c
10 files changed
+23
-15
src/addons/link/__tests__/ReactLinkPropTypes-test.js
+1
-1
@@ -40,7 +40,7 @@ function typeCheckPass(declaration, value) {
40
'testComponent',
41
ReactPropTypeLocations.prop
42
);
43
- expect(error).toBe(undefined);
43
+ expect(error).toBe(null);
44
}
45
46
describe('ReactLink', function() {
src/browser/eventPlugins/BeforeInputEventPlugin.js
+2
-2
@@ -256,7 +256,7 @@ function extractCompositionEvent(
256
}
257
258
if (!eventType) {
259
- return;
259
+ return null;
260
}
261
262
if (useFallbackCompositionData) {
@@ -427,7 +427,7 @@ function extractBeforeInputEvent(
427
// If no characters are being inserted, no BeforeInput event should
428
// be fired.
429
if (!chars) {
430
- return;
430
+ return null;
431
}
432
433
var event = SyntheticInputEvent.getPooled(
src/browser/eventPlugins/SelectEventPlugin.js
+1
-1
@@ -95,7 +95,7 @@ function constructSelectEvent(nativeEvent) {
95
if (mouseDown ||
96
activeElement == null ||
97
activeElement !== getActiveElement()) {
98
- return;
98
+ return null;
99
}
100
101
// Only fire when selection has actually changed.
src/browser/eventPlugins/TapEventPlugin.js
+1
-1
@@ -117,7 +117,7 @@ var TapEventPlugin = {
117
usedTouchTime = Date.now();
118
} else {
119
if (usedTouch && (Date.now() - usedTouchTime < TOUCH_DELAY)) {
120
- return;
120
+ return null;
121
}
122
}
123
var event = null;
src/browser/ui/ReactEventListener.js
+2
-2
@@ -123,7 +123,7 @@ var ReactEventListener = {
123
trapBubbledEvent: function(topLevelType, handlerBaseName, handle) {
124
var element = handle;
125
if (!element) {
126
- return;
126
+ return null;
127
}
128
return EventListener.listen(
129
element,
@@ -145,7 +145,7 @@ var ReactEventListener = {
145
trapCapturedEvent: function(topLevelType, handlerBaseName, handle) {
146
var element = handle;
147
if (!element) {
148
- return;
148
+ return null;
149
}
150
return EventListener.capture(
151
element,
src/browser/ui/dom/components/LinkedValueUtils.js
+2
-2
@@ -81,7 +81,7 @@ var LinkedValueUtils = {
81
props.onChange ||
82
props.readOnly ||
83
props.disabled) {
84
- return;
84
+ return null;
85
}
86
return new Error(
87
'You provided a `value` prop to a form field without an ' +
@@ -95,7 +95,7 @@ var LinkedValueUtils = {
95
props.onChange ||
96
props.readOnly ||
97
props.disabled) {
98
- return;
98
+ return null;
99
}
100
return new Error(
101
'You provided a `checked` prop to a form field without an ' +
src/browser/ui/dom/components/ReactDOMSelect.js
+1
-1
@@ -39,7 +39,7 @@ function updateOptionsIfPendingUpdateAndMounted() {
39
*/
40
function selectValueType(props, propName, componentName) {
41
if (props[propName] == null) {
42
- return;
42
+ return null;
43
}
44
if (props.multiple) {
45
if (!Array.isArray(props[propName])) {
src/classic/types/ReactPropTypes.js
+11
-3
@@ -98,6 +98,7 @@ function createChainableTypeChecker(validate) {
98
`\`${componentName}\`.`
99
);
100
}
101
+ return null;
102
} else {
103
return validate(props, propName, componentName, location);
104
}
@@ -125,12 +126,13 @@ function createPrimitiveTypeChecker(expectedType) {
126
`supplied to \`${componentName}\`, expected \`${expectedType}\`.`
127
);
128
}
129
+ return null;
130
}
131
return createChainableTypeChecker(validate);
132
}
133
134
function createAnyTypeChecker() {
133
- return createChainableTypeChecker(emptyFunction.thatReturns());
135
+ return createChainableTypeChecker(emptyFunction.thatReturns(null));
136
}
137
138
function createArrayOfTypeChecker(typeChecker) {
@@ -150,6 +152,7 @@ function createArrayOfTypeChecker(typeChecker) {
152
return error;
153
}
154
}
155
+ return null;
156
}
157
return createChainableTypeChecker(validate);
158
}
@@ -163,6 +166,7 @@ function createElementTypeChecker() {
166
`\`${componentName}\`, expected a ReactElement.`
167
);
168
}
169
+ return null;
170
}
171
return createChainableTypeChecker(validate);
172
}
@@ -177,6 +181,7 @@ function createInstanceTypeChecker(expectedClass) {
181
`\`${componentName}\`, expected instance of \`${expectedClassName}\`.`
182
);
183
}
184
+ return null;
185
}
186
return createChainableTypeChecker(validate);
187
}
@@ -186,7 +191,7 @@ function createEnumTypeChecker(expectedValues) {
191
var propValue = props[propName];
192
for (var i = 0; i < expectedValues.length; i++) {
193
if (propValue === expectedValues[i]) {
189
- return;
194
+ return null;
195
}
196
}
197
@@ -219,6 +224,7 @@ function createObjectOfTypeChecker(typeChecker) {
224
}
225
}
226
}
227
+ return null;
228
}
229
return createChainableTypeChecker(validate);
230
}
@@ -228,7 +234,7 @@ function createUnionTypeChecker(arrayOfTypeCheckers) {
234
for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
235
var checker = arrayOfTypeCheckers[i];
236
if (checker(props, propName, componentName, location) == null) {
231
- return;
237
+ return null;
238
}
239
}
240
@@ -250,6 +256,7 @@ function createNodeChecker() {
256
`\`${componentName}\`, expected a ReactNode.`
257
);
258
}
259
+ return null;
260
}
261
return createChainableTypeChecker(validate);
262
}
@@ -275,6 +282,7 @@ function createShapeTypeChecker(shapeTypes) {
282
return error;
283
}
284
}
285
+ return null;
286
}
287
return createChainableTypeChecker(validate, 'expected `object`');
288
}
src/classic/types/__tests__/ReactPropTypes-test.js
+1
-1
@@ -41,7 +41,7 @@ function typeCheckPass(declaration, value) {
41
'testComponent',
42
ReactPropTypeLocations.prop
43
);
44
- expect(error).toBe(undefined);
44
+ expect(error).toBe(null);
45
}
46
47
describe('ReactPropTypes', function() {
src/core/ReactChildReconciler.js
+1
-1
@@ -67,7 +67,7 @@ var ReactChildReconciler = {
67
// can quickly bailout if nothing has changed.
68
var nextChildren = flattenChildren(nextNestedChildNodes);
69
if (!nextChildren && !prevChildren) {
70
- return;
70
+ return null;
71
}
72
var name;
73
for (name in nextChildren) {