The library for web and native user interfaces.
Fix most lint warnings/errors
CommitSyncScript committed
Jun 17, 2013 at 16:25 UTC
315645804133e190e23be954787f5d64144d33d5
23 files changed
+71
-30
src/core/ReactComponent.js
+17
-5
@@ -16,6 +16,8 @@
16
* @providesModule ReactComponent
17
*/
18
19
+/*jslint evil: true */
20
+
21
"use strict";
22
23
var ReactCurrentOwner = require('ReactCurrentOwner');
@@ -125,7 +127,9 @@ function assignKey(groupingIndex, child, index) {
127
function tryToReuseArray(children) {
128
for (var i = 0; i < children.length; i++) {
129
var child = children[i];
128
- if (isEmptyChild(child)) return false;
130
+ if (isEmptyChild(child)) {
131
+ return false;
132
+ }
133
assignKey(0, child, i);
134
}
135
return true;
@@ -142,7 +146,9 @@ function tryToReuseArray(children) {
146
function appendNestedChildren(groupingIndex, sourceArray, targetArray) {
147
for (var i = 0; i < sourceArray.length; i++) {
148
var child = sourceArray[i];
145
- if (isEmptyChild(child)) continue;
149
+ if (isEmptyChild(child)) {
150
+ continue;
151
+ }
152
assignKey(groupingIndex, child, i);
153
// TODO: Invalid components like strings could possibly need
154
// keys assigned to them here. Usually they're not stateful but
@@ -338,9 +344,13 @@ var ReactComponent = {
344
for (var i = 1; i < arguments.length; i++) {
345
var child = arguments[i];
346
if (Array.isArray(child)) {
341
- if (child.length === 0) continue;
347
+ if (child.length === 0) {
348
+ continue;
349
+ }
350
343
- if (targetArray === null) targetArray = [];
351
+ if (targetArray === null) {
352
+ targetArray = [];
353
+ }
354
appendNestedChildren(i - 1, child, targetArray);
355
356
} else if (!isEmptyChild(child)) {
@@ -352,7 +362,9 @@ var ReactComponent = {
362
child._key = createKey(child.props.key, i - 1);
363
}
364
355
- if (targetArray === null) targetArray = [];
365
+ if (targetArray === null) {
366
+ targetArray = [];
367
+ }
368
targetArray.push(child);
369
370
}
src/core/ReactCurrentOwner.js
+3
-1
@@ -40,7 +40,9 @@ var ReactCurrentOwner = {
40
*/
41
getDepth: function() {
42
var owner = ReactCurrentOwner.current;
43
- if (!owner) return 0;
43
+ if (!owner) {
44
+ return 0;
45
+ }
46
return owner._compositionLevel;
47
}
48
src/core/__tests__/ReactDOM-test.js
+11
-6
@@ -17,6 +17,8 @@
17
* @emails react-core
18
*/
19
20
+/*jslint evil: true */
21
+
22
"use strict";
23
24
var React = require('React');
@@ -81,27 +83,30 @@ describe('ref swapping', function() {
83
theBird: <div class="bird" />
84
}}</div>
85
);
86
+ // Warm the cache with theDog
87
myDiv.setProps({
88
children: {
86
- theDog: <div class="dogbeforedelete" />, // Warm the cache with theDog
89
+ theDog: <div class="dogbeforedelete" />,
90
theBird: <div class="bird" />
91
}
92
});
93
+ // Remove theDog - this should purge the cache
94
myDiv.setProps({
91
- children: { // This better purge that cache
95
+ children: {
96
theBird: <div class="bird" />
97
}
98
});
95
- // Now, put the dog back.
99
+ // Now, put theDog back. It's now a different DOM node.
100
myDiv.setProps({
101
children: {
98
- theDog: <div class="dog" />, // This is a different node than before
102
+ theDog: <div class="dog" />,
103
theBird: <div class="bird" />
104
}
105
});
106
+ // Change the className of theDog. It will use the same element
107
myDiv.setProps({
103
- children: { // className changed to bigdog.
104
- theDog: <div class="bigdog" />, // but will it use the proper element
108
+ children: {
109
+ theDog: <div class="bigdog" />,
110
theBird: <div class="bird" />
111
}
112
});
src/core/__tests__/ReactInstanceHandles-test.js
-2
@@ -22,8 +22,6 @@
22
var React = require('React');
23
var ReactTestUtils = require('ReactTestUtils');
24
25
-var reactComponentExpect= require('reactComponentExpect');
26
-
25
/**
26
* Ensure that all callbacks are invoked, passing this unique argument.
27
*/
src/core/__tests__/ReactMountDestruction-test.js
-5
@@ -19,12 +19,7 @@
19
20
"use strict";
21
22
-var ReactMount = require('ReactMount');
22
var React = require('React');
24
-var ReactTestUtils = require('ReactTestUtils');
25
-var ReactMount = require('ReactMount');
26
-
27
-var reactComponentExpect = require('reactComponentExpect');
23
24
describe('ReactMount', function() {
25
it("should destroy a react root upon request", function() {
src/core/__tests__/ReactMultiChildText-test.js
+4
-3
@@ -17,13 +17,14 @@
17
* @emails react-core
18
*/
19
20
+/*jslint evil: true */
21
+
22
"use strict";
23
24
require('mock-modules');
25
26
var React = require('React');
27
var ReactTestUtils = require('ReactTestUtils');
26
-var ReactTextComponent = require('ReactTextComponent');
28
29
var reactComponentExpect = require('reactComponentExpect');
30
@@ -141,7 +142,7 @@ describe('ReactMultiChildText', function() {
142
assertMultiChild(d, 'hello', 'goodbye');
143
});
144
144
- it('should render zero string as text node then switch to spans', function() {
145
+ it('should render zero string as text node then switch to spans', function() {
146
var d = renderSingleTextChild('0');
147
// false should act exactly as a null child
148
assertNodeText(d, '0');
@@ -149,7 +150,7 @@ describe('ReactMultiChildText', function() {
150
assertMultiChild(d, 'hello', 'goodbye');
151
});
152
152
- it('should render zero number as text node then switch to spans', function() {
153
+ it('should render zero number as text node then switch to spans', function() {
154
var d = renderSingleTextChild('0');
155
// false should act exactly as a null child
156
assertNodeText(d, 0);
src/core/__tests__/ReactProps-test.js
+1
-1
@@ -26,7 +26,7 @@ function typeCheck(declaration, value) {
26
if (arguments.length > 1) {
27
props.testProp = value;
28
}
29
- return declaration.bind(this, props, 'testProp', 'testComponent');
29
+ return declaration.bind(null, props, 'testProp', 'testComponent');
30
}
31
32
describe('Primitive Types', function() {
src/dom/DOMChildrenOperations.js
+3
@@ -16,6 +16,9 @@
16
* @providesModule DOMChildrenOperations
17
*/
18
19
+// Empty blocks improve readability so disable that warning
20
+// jshint -W035
21
+
22
"use strict";
23
24
var Danger = require('Danger');
src/dom/Danger.js
+2
@@ -16,6 +16,8 @@
16
* @providesModule Danger
17
*/
18
19
+/*jslint evil: true */
20
+
21
"use strict";
22
23
var ExecutionEnvironment = require('ExecutionEnvironment');
src/dom/__tests__/CSSPropertyOperations-test.js
+2
@@ -17,6 +17,8 @@
17
* @emails react-core
18
*/
19
20
+/*jslint evil: true */
21
+
22
"use strict";
23
24
var React = require('React');
src/dom/getEventTarget.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var ExecutionEnvironment = require('ExecutionEnvironment');
23
24
/**
src/environment/__tests__/ReactServerRendering-test.js
+3
-1
@@ -17,6 +17,8 @@
17
* @emails react-core
18
*/
19
20
+/*jslint evil: true */
21
+
22
"use strict";
23
24
require('mock-modules')
@@ -147,7 +149,7 @@ describe('ReactServerRendering', function() {
149
return (
150
<span ref="span" onClick={this.click}>Name: {this.props.name}</span>
151
);
150
- },
152
+ }
153
});
154
155
var element = document.createElement('div');
src/event/synthetic/SyntheticEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var PooledClass = require('PooledClass');
23
24
var emptyFunction = require('emptyFunction');
src/event/synthetic/SyntheticFocusEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var SyntheticUIEvent = require('SyntheticUIEvent');
23
24
/**
src/event/synthetic/SyntheticKeyboardEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var SyntheticUIEvent = require('SyntheticUIEvent');
23
24
/**
src/event/synthetic/SyntheticMouseEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var BrowserEnv = require('BrowserEnv');
23
var SyntheticUIEvent = require('SyntheticUIEvent');
24
src/event/synthetic/SyntheticMutationEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var SyntheticEvent = require('SyntheticEvent');
23
24
/**
src/event/synthetic/SyntheticTouchEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var SyntheticUIEvent = require('SyntheticUIEvent');
23
24
/**
src/event/synthetic/SyntheticUIEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var SyntheticEvent = require('SyntheticEvent');
23
24
/**
src/event/synthetic/SyntheticWheelEvent.js
+2
@@ -17,6 +17,8 @@
17
* @typechecks
18
*/
19
20
+"use strict";
21
+
22
var SyntheticMouseEvent = require('SyntheticMouseEvent');
23
24
/**
src/eventPlugins/EnterLeaveEventPlugin.js
+3
-2
@@ -72,8 +72,9 @@ var EnterLeaveEventPlugin = {
72
var from, to;
73
if (topLevelType === topLevelTypes.topMouseOut) {
74
from = topLevelTarget;
75
- to = getFirstReactDOM(nativeEvent.relatedTarget || nativeEvent.toElement)
76
- || ExecutionEnvironment.global;
75
+ to =
76
+ getFirstReactDOM(nativeEvent.relatedTarget || nativeEvent.toElement) ||
77
+ ExecutionEnvironment.global;
78
} else {
79
from = ExecutionEnvironment.global;
80
to = topLevelTarget;
src/utils/__tests__/ImmutableObject-test.js
+1
-4
@@ -23,9 +23,6 @@ require('mock-modules')
23
24
var ImmutableObject;
25
26
-var expectSeriallyEqual = function(one, two) {
27
-};
28
-
26
/**
27
* To perform performance testing of using `ImmutableObject` vs. not using
28
* `ImmutableObject`, such testing must be done with __DEV__ set to false.
@@ -270,7 +267,7 @@ describe('ImmutableObject', function() {
267
});
268
expect(afterIO).toBeSeriallyEqualTo({
269
a: {b: {}, c: 'C', d: 'd', e: {f: 'F', g: 'G'}, h: 'H'}
273
- })
270
+ });
271
expect(afterIO).not.toBe(beforeIO);
272
expect(afterIO.a).not.toBe(beforeIO.a);
273
expect(afterIO.a.e).not.toBe(beforeIO.a.e);
src/utils/mergeDeepInto.js
+3
@@ -16,6 +16,9 @@
16
* @providesModule mergeDeepInto
17
*/
18
19
+// Empty blocks improve readability so disable that warning
20
+// jshint -W035
21
+
22
"use strict";
23
24
var keyMirror = require('keyMirror');