[lint] Fix majority of issues eslint found
Paul O’Shannessy committed
Dec 18, 2014 at 16:46 UTC
e27da9973193a06a138d7098c58723a7f10ed2e5
30 files changed
+78
-51
src/addons/ReactRAFBatchingStrategy.js
+2
@@ -10,6 +10,8 @@
10
* @typechecks static-only
11
*/
12
13
+/* global requestAnimationFrame:true */
14
+
15
'use strict';
16
17
var ExecutionEnvironment = require('ExecutionEnvironment');
src/addons/transitions/ReactCSSTransitionGroupChild.js
+3
-1
@@ -64,7 +64,9 @@ var ReactCSSTransitionGroupChild = React.createClass({
64
65
// Usually this optional callback is used for informing an owner of
66
// a leave animation and telling it to remove the child.
67
- finishCallback && finishCallback();
67
+ if (finishCallback) {
68
+ finishCallback();
69
+ }
70
};
71
72
ReactTransitionEvents.addEndEventListener(node, endListener);
src/browser/__tests__/findDOMNode-test.js
-1
@@ -48,4 +48,3 @@ describe('findDOMNode', function() {
48
});
49
50
});
51
-
src/browser/eventPlugins/BeforeInputEventPlugin.js
+1
-1
@@ -490,7 +490,7 @@ var BeforeInputEventPlugin = {
490
topLevelTarget,
491
topLevelTargetID,
492
nativeEvent
493
- ),
493
+ )
494
];
495
}
496
};
src/browser/eventPlugins/FallbackCompositionState.js
+5
-3
@@ -58,19 +58,21 @@ assign(FallbackCompositionState.prototype, {
58
return this._fallbackText;
59
}
60
61
- var endValue = this.getText();
61
+ var start;
62
var startValue = this._startText;
63
var startLength = startValue.length;
64
+ var end;
65
+ var endValue = this.getText();
66
var endLength = endValue.length;
67
66
- for (var start = 0; start < startLength; start++) {
68
+ for (start = 0; start < startLength; start++) {
69
if (startValue[start] !== endValue[start]) {
70
break;
71
}
72
}
73
74
var minEnd = startLength - start;
73
- for (var end = 1; end <= minEnd; end++) {
75
+ for (end = 1; end <= minEnd; end++) {
76
if (startValue[startLength - end] !== endValue[endLength - end]) {
77
break;
78
}
src/browser/eventPlugins/SelectEventPlugin.js
+1
-1
@@ -94,7 +94,7 @@ function constructSelectEvent(nativeEvent) {
94
// won't dispatch.
95
if (mouseDown ||
96
activeElement == null ||
97
- activeElement != getActiveElement()) {
97
+ activeElement !== getActiveElement()) {
98
return;
99
}
100
src/browser/findDOMNode.js
+3
-3
@@ -35,9 +35,9 @@ function findDOMNode(componentOrElement) {
35
}
36
invariant(
37
componentOrElement.render == null ||
38
- typeof(componentOrElement.render) !== 'function',
39
- 'Component (with keys: %s) contains `render` method '
40
- +'but is not mounted in the DOM',
38
+ typeof componentOrElement.render !== 'function',
39
+ 'Component (with keys: %s) contains `render` method ' +
40
+ 'but is not mounted in the DOM',
41
Object.keys(componentOrElement)
42
);
43
invariant(
src/browser/syntheticEvents/SyntheticClipboardEvent.js
-1
@@ -41,4 +41,3 @@ function SyntheticClipboardEvent(dispatchConfig, dispatchMarker, nativeEvent) {
41
SyntheticEvent.augmentClass(SyntheticClipboardEvent, ClipboardEventInterface);
42
43
module.exports = SyntheticClipboardEvent;
44
-
src/browser/syntheticEvents/SyntheticCompositionEvent.js
-1
@@ -41,4 +41,3 @@ SyntheticEvent.augmentClass(
41
);
42
43
module.exports = SyntheticCompositionEvent;
44
-
src/browser/syntheticEvents/SyntheticEvent.js
+10
-2
@@ -88,13 +88,21 @@ assign(SyntheticEvent.prototype, {
88
preventDefault: function() {
89
this.defaultPrevented = true;
90
var event = this.nativeEvent;
91
- event.preventDefault ? event.preventDefault() : event.returnValue = false;
91
+ if (event.preventDefault) {
92
+ event.preventDefault();
93
+ } else {
94
+ event.returnValue = false;
95
+ }
96
this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
97
},
98
99
stopPropagation: function() {
100
var event = this.nativeEvent;
97
- event.stopPropagation ? event.stopPropagation() : event.cancelBubble = true;
101
+ if (event.stopPropagation) {
102
+ event.stopPropagation();
103
+ } else {
104
+ event.cancelBubble = true;
105
+ }
106
this.isPropagationStopped = emptyFunction.thatReturnsTrue;
107
},
108
src/browser/syntheticEvents/SyntheticInputEvent.js
-1
@@ -42,4 +42,3 @@ SyntheticEvent.augmentClass(
42
);
43
44
module.exports = SyntheticInputEvent;
45
-
src/browser/ui/ReactDOMComponent.js
+5
-3
@@ -10,6 +10,8 @@
10
* @typechecks static-only
11
*/
12
13
+/* global hasOwnProperty:true */
14
+
15
'use strict';
16
17
var CSSPropertyOperations = require('CSSPropertyOperations');
@@ -73,9 +75,9 @@ function assertValidProps(props) {
75
if (props.contentEditable && props.children != null) {
76
console.warn(
77
'A component is `contentEditable` and contains `children` managed by ' +
76
- 'React. It is now your responsibility to guarantee that none of those '+
77
- 'nodes are unexpectedly modified or duplicated. This is probably not ' +
78
- 'intentional.'
78
+ 'React. It is now your responsibility to guarantee that none of ' +
79
+ 'those nodes are unexpectedly modified or duplicated. This is ' +
80
+ 'probably not intentional.'
81
);
82
}
83
}
src/browser/ui/ReactMount.js
+3
-1
@@ -435,7 +435,9 @@ var ReactMount = {
435
container,
436
shouldReuseMarkup
437
).getPublicInstance();
438
- callback && callback.call(component);
438
+ if (callback) {
439
+ callback.call(component);
440
+ }
441
return component;
442
},
443
src/browser/ui/dom/DOMChildrenOperations.js
+5
-3
@@ -100,7 +100,8 @@ var DOMChildrenOperations = {
100
// List of children that will be moved or removed.
101
var updatedChildren = null;
102
103
- for (var i = 0; update = updates[i]; i++) {
103
+ for (var i = 0; i < updates.length; i++) {
104
+ update = updates[i];
105
if (update.type === ReactMultiChildUpdateTypes.MOVE_EXISTING ||
106
update.type === ReactMultiChildUpdateTypes.REMOVE_NODE) {
107
var updatedIndex = update.fromIndex;
@@ -112,7 +113,7 @@ var DOMChildrenOperations = {
113
'processUpdates(): Unable to find child %s of element. This ' +
114
'probably means the DOM was unexpectedly mutated (e.g., by the ' +
115
'browser), usually due to forgetting a <tbody> when using tables, ' +
115
- 'nesting tags like <form>, <p>, or <a>, or using non-SVG elements '+
116
+ 'nesting tags like <form>, <p>, or <a>, or using non-SVG elements ' +
117
'in an <svg> parent. Try inspecting the child nodes of the element ' +
118
'with React ID `%s`.',
119
updatedIndex,
@@ -137,7 +138,8 @@ var DOMChildrenOperations = {
138
}
139
}
140
140
- for (var k = 0; update = updates[k]; k++) {
141
+ for (var k = 0; k < updates.length; k++) {
142
+ update = updates[k];
143
switch (update.type) {
144
case ReactMultiChildUpdateTypes.INSERT_MARKUP:
145
insertChildAt(
src/browser/ui/dom/Danger.js
+4
-3
@@ -82,7 +82,8 @@ var Danger = {
82
// This for-in loop skips the holes of the sparse array. The order of
83
// iteration should follow the order of assignment, which happens to match
84
// numerical index order, but we don't rely on that.
85
- for (var resultIndex in markupListByNodeName) {
85
+ var resultIndex;
86
+ for (resultIndex in markupListByNodeName) {
87
if (markupListByNodeName.hasOwnProperty(resultIndex)) {
88
var markup = markupListByNodeName[resultIndex];
89
@@ -103,8 +104,8 @@ var Danger = {
104
emptyFunction // Do nothing special with <script> tags.
105
);
106
106
- for (i = 0; i < renderNodes.length; ++i) {
107
- var renderNode = renderNodes[i];
107
+ for (var j = 0; j < renderNodes.length; ++j) {
108
+ var renderNode = renderNodes[j];
109
if (renderNode.hasAttribute &&
110
renderNode.hasAttribute(RESULT_INDEX_ATTR)) {
111
src/browser/ui/dom/getNodeForCharacterOffset.js
+1
-1
@@ -53,7 +53,7 @@ function getNodeForCharacterOffset(root, offset) {
53
var nodeEnd = 0;
54
55
while (node) {
56
- if (node.nodeType == 3) {
56
+ if (node.nodeType === 3) {
57
nodeEnd = nodeStart + node.textContent.length;
58
59
if (nodeStart <= offset && nodeEnd >= offset) {
src/browser/ui/dom/setInnerHTML.js
+2
@@ -9,6 +9,8 @@
9
* @providesModule setInnerHTML
10
*/
11
12
+/* globals MSApp */
13
+
14
'use strict';
15
16
var ExecutionEnvironment = require('ExecutionEnvironment');
src/classic/class/ReactClass.js
+1
-1
@@ -382,7 +382,7 @@ function validateTypeDef(Constructor, typeDef, location) {
382
for (var propName in typeDef) {
383
if (typeDef.hasOwnProperty(propName)) {
384
invariant(
385
- typeof typeDef[propName] == 'function',
385
+ typeof typeDef[propName] === 'function',
386
'%s: %s type `%s` is invalid; it must be a function, usually from ' +
387
'React.PropTypes.',
388
Constructor.displayName || 'ReactClass',
src/classic/types/ReactPropTypes.js
+1
-1
@@ -280,7 +280,7 @@ function createShapeTypeChecker(shapeTypes) {
280
}
281
282
function isNode(propValue) {
283
- switch(typeof propValue) {
283
+ switch (typeof propValue) {
284
case 'number':
285
case 'string':
286
return true;
src/core/ReactComponentEnvironment.js
+1
-1
@@ -50,7 +50,7 @@ var ReactComponentEnvironment = {
50
environment.processChildrenUpdates;
51
injected = true;
52
}
53
- },
53
+ }
54
55
};
56
src/core/ReactInstanceHandles.js
+2
-1
@@ -115,7 +115,8 @@ function getNextDescendantID(ancestorID, destinationID) {
115
// Skip over the ancestor and the immediate separator. Traverse until we hit
116
// another separator or we reach the end of `destinationID`.
117
var start = ancestorID.length + SEPARATOR_LENGTH;
118
- for (var i = start; i < destinationID.length; i++) {
118
+ var i;
119
+ for (i = start; i < destinationID.length; i++) {
120
if (isBoundary(destinationID, i)) {
121
break;
122
}
src/core/ReactMultiChild.js
+11
-2
@@ -226,7 +226,11 @@ var ReactMultiChild = {
226
} finally {
227
updateDepth--;
228
if (!updateDepth) {
229
- errorThrown ? clearQueue() : processQueue();
229
+ if (errorThrown) {
230
+ clearQueue();
231
+ } else {
232
+ processQueue();
233
+ }
234
}
235
}
236
},
@@ -247,8 +251,13 @@ var ReactMultiChild = {
251
} finally {
252
updateDepth--;
253
if (!updateDepth) {
250
- errorThrown ? clearQueue() : processQueue();
254
+ if (errorThrown) {
255
+ clearQueue();
256
+ } else {
257
+ processQueue();
258
+ }
259
}
260
+
261
}
262
},
263
src/core/ReactPropTransferer.js
+1
-1
@@ -101,7 +101,7 @@ var ReactPropTransferer = {
101
*/
102
mergeProps: function(oldProps, newProps) {
103
return transferInto(assign({}, oldProps), newProps);
104
- },
104
+ }
105
106
};
107
src/core/shouldUpdateReactComponent.js
+2
-2
@@ -39,7 +39,7 @@ function shouldUpdateReactComponent(prevElement, nextElement) {
39
var prevName = null;
40
var nextName = null;
41
var nextDisplayName = null;
42
- if(__DEV__) {
42
+ if (__DEV__) {
43
if (!ownersMatch) {
44
if (prevElement._owner != null &&
45
prevElement._owner.getPublicInstance() != null &&
@@ -51,7 +51,7 @@ function shouldUpdateReactComponent(prevElement, nextElement) {
51
nextElement._owner.getPublicInstance().constructor != null) {
52
nextName = nextElement._owner.getPublicInstance().constructor.displayName;
53
}
54
- if(nextElement.type != null && nextElement.type.displayName != null) {
54
+ if (nextElement.type != null && nextElement.type.displayName != null) {
55
nextDisplayName = nextElement.type.displayName;
56
}
57
monitorCodeUse(
src/event/EventPluginHub.js
+8
-6
@@ -58,12 +58,14 @@ var executeDispatchesAndRelease = function(event) {
58
var InstanceHandle = null;
59
60
function validateInstanceHandle() {
61
- var invalid = !InstanceHandle||
62
- !InstanceHandle.traverseTwoPhase ||
63
- !InstanceHandle.traverseEnterLeave;
64
- if (invalid) {
65
- throw new Error('InstanceHandle not injected before use!');
66
- }
61
+ var valid =
62
+ InstanceHandle &&
63
+ InstanceHandle.traverseTwoPhase &&
64
+ InstanceHandle.traverseEnterLeave;
65
+ invariant(
66
+ valid,
67
+ 'InstanceHandle not injected before use!'
68
+ );
69
}
70
71
/**
src/modern/class/ReactComponentBase.js
-1
@@ -13,7 +13,6 @@
13
14
var ReactInstanceMap = require('ReactInstanceMap');
15
16
-var assign = require('Object.assign');
16
var invariant = require('invariant');
17
var warning = require('warning');
18
src/modern/class/__tests__/ReactES6Class-test.js
-2
@@ -11,8 +11,6 @@
11
12
'use strict';
13
14
-var mocks = require('mocks');
15
-
14
var React;
15
16
describe('ReactES6Class', function() {
src/utils/OrderedMap.js
+1
-1
@@ -29,7 +29,7 @@ var PREFIX = 'key:';
29
*/
30
function extractObjectFromArray(arr, keyExtractor) {
31
var normalizedObj = {};
32
- for (var i=0; i < arr.length; i++) {
32
+ for (var i = 0; i < arr.length; i++) {
33
var item = arr[i];
34
var key = keyExtractor(item);
35
assertValidPublicKey(key);
src/utils/Transaction.js
+2
-2
@@ -203,8 +203,8 @@ var Mixin = {
203
// close -- if it's still set to true in the finally block, it means
204
// wrapper.close threw.
205
errorThrown = true;
206
- if (initData !== Transaction.OBSERVED_ERROR) {
207
- wrapper.close && wrapper.close.call(this, initData);
206
+ if (initData !== Transaction.OBSERVED_ERROR && wrapper.close) {
207
+ wrapper.close.call(this, initData);
208
}
209
errorThrown = false;
210
} finally {
src/utils/memoizeStringOnly.js
+3
-4
@@ -21,11 +21,10 @@
21
function memoizeStringOnly(callback) {
22
var cache = {};
23
return function(string) {
24
- if (cache.hasOwnProperty(string)) {
25
- return cache[string];
26
- } else {
27
- return cache[string] = callback.call(this, string);
24
+ if (!cache.hasOwnProperty(string)) {
25
+ cache[string] = callback.call(this, string);
26
}
27
+ return cache[string];
28
};
29
}
30