Skip to content

Commit 332a3a9

Browse files
committed
Use jsxhint and fix all warnings/errors
1 parent cf00ec7 commit 332a3a9

File tree

14 files changed

+33
-55
lines changed

14 files changed

+33
-55
lines changed

.jshintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
dist
2+
node_modules

.jshintrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"eqnull": true,
3+
"esnext": true,
4+
"unused": "vars",
5+
"predef": [ "-Promise" ]
6+
}

eslint.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

modules/__tests__/Router-test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
var assert = require('assert');
21
var expect = require('expect');
32
var React = require('react');
3+
var Router = require('../index');
44
var Route = require('../components/Route');
5-
var RouteHandler = require('../components/RouteHandler');
65
var TestLocation = require('../locations/TestLocation');
76
var ScrollToTopBehavior = require('../behaviors/ScrollToTopBehavior');
87
var getWindowScrollPosition = require('../utils/getWindowScrollPosition');
9-
var Router = require('../index');
108

119
var {
1210
Foo,
@@ -681,7 +679,7 @@ describe('Router.run', function () {
681679

682680
describe('locations', function () {
683681
it('defaults to HashLocation', function (done) {
684-
var routes = <Route path="/" handler={Foo}/>
682+
var routes = <Route path="/" handler={Foo}/>;
685683
var div = document.createElement('div');
686684
Router.run(routes, function (Handler) {
687685
React.render(<Handler/>, div, function () {

modules/__tests__/TestHandlers.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ exports.Nested = React.createClass({
1616

1717
exports.Foo = React.createClass({
1818
render: function () {
19-
return <div className="Foo">Foo</div>
19+
return <div className="Foo">Foo</div>;
2020
}
2121
});
2222

2323
exports.Bar = React.createClass({
2424
render: function () {
25-
return <div className="Bar">Bar</div>
25+
return <div className="Bar">Bar</div>;
2626
}
2727
});
2828

2929
exports.Baz = React.createClass({
3030
render: function () {
31-
return <div className="Baz">Baz</div>
31+
return <div className="Baz">Baz</div>;
3232
}
3333
});
3434

@@ -42,7 +42,7 @@ exports.Async = React.createClass({
4242
},
4343

4444
render: function () {
45-
return <div className="Async">Async</div>
45+
return <div className="Async">Async</div>;
4646
}
4747
});
4848

@@ -112,6 +112,6 @@ exports.EchoFooProp = React.createClass({
112112
exports.EchoBarParam = React.createClass({
113113
mixins: [ State ],
114114
render: function () {
115-
return <div className="EchoBarParam">{this.getParams().bar}</div>
115+
return <div className="EchoBarParam">{this.getParams().bar}</div>;
116116
}
117117
});

modules/components/__tests__/DefaultRoute-test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
/** @jsx React.DOM */
2-
var assert = require('assert');
31
var expect = require('expect');
4-
var React = require('react/addons');
2+
var React = require('react');
53
var Router = require('../../index');
64
var DefaultRoute = require('../DefaultRoute');
75
var Route = require('../Route');
8-
var RouteHandler = require('../RouteHandler');
96
var { Foo, Bar, Nested } = require('../../__tests__/TestHandlers');
107

118
describe('DefaultRoute', function () {

modules/components/__tests__/Link-test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var assert = require('assert');
22
var expect = require('expect');
33
var React = require('react/addons');
44
var Router = require('../../index');
5-
var ReactTestUtils = React.addons.TestUtils;
65
var Route = require('../Route');
76
var Link = require('../Link');
87
var RouteHandler = require('../RouteHandler');
@@ -15,7 +14,7 @@ describe('A Link', function () {
1514
it('knows how to make its href', function () {
1615
var LinkHandler = React.createClass({
1716
render: function () {
18-
return <Link to="foo" params={{bar: 'baz'}} query={{qux: 'quux'}}>Link</Link>
17+
return <Link to="foo" params={{bar: 'baz'}} query={{qux: 'quux'}}>Link</Link>;
1918
}
2019
});
2120

modules/components/__tests__/NotFoundRoute-test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
/** @jsx React.DOM */
2-
var assert = require('assert');
31
var expect = require('expect');
4-
var React = require('react/addons');
2+
var React = require('react');
53
var Router = require('../../index');
64
var NotFoundRoute = require('../NotFoundRoute');
75
var Route = require('../Route');
8-
var RouteHandler = require('../RouteHandler');
96
var { Nested, Foo, Bar } = require('../../__tests__/TestHandlers');
107

118
describe('NotFoundRoute', function () {

modules/components/__tests__/Redirect-test.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/** @jsx React.DOM */
2-
var assert = require('assert');
31
var expect = require('expect');
4-
var React = require('react/addons');
2+
var React = require('react');
53
var Router = require('../../index');
64
var TestLocation = require('../../locations/TestLocation');
75
var { Nested, Bar } = require('../../__tests__/TestHandlers');
@@ -20,7 +18,7 @@ describe('Redirect', function () {
2018
];
2119

2220
Router.run(routes, TestLocation, function (Handler) {
23-
var html = React.render(<Handler />, div);
21+
React.render(<Handler />, div);
2422
expect(div.innerHTML).toMatch(/Bar/);
2523
});
2624
});
@@ -36,7 +34,7 @@ describe('Redirect', function () {
3634
];
3735

3836
Router.run(routes, TestLocation, function (Handler) {
39-
var html = React.render(<Handler />, div);
37+
React.render(<Handler />, div);
4038
expect(div.innerHTML).toMatch(/Bar/);
4139
});
4240
});
@@ -57,7 +55,7 @@ describe('Redirect', function () {
5755
);
5856

5957
Router.run(routes, TestLocation, function (Handler) {
60-
var html = React.render(<Handler />, div);
58+
React.render(<Handler />, div);
6159
expect(div.innerHTML).toMatch(/Bar/);
6260
});
6361
});
@@ -76,7 +74,7 @@ describe('Redirect', function () {
7674
);
7775

7876
Router.run(routes, TestLocation, function (Handler) {
79-
var html = React.render(<Handler />, div);
77+
React.render(<Handler />, div);
8078
expect(div.innerHTML).toMatch(/Bar/);
8179
});
8280
});

modules/components/__tests__/RouteHandler-test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
/** @jsx React.DOM */
2-
var assert = require('assert');
31
var expect = require('expect');
42
var React = require('react');
53
var Router = require('../../index');
64
var Route = require('../Route');
75
var RouteHandler = require('../RouteHandler');
86
var TestLocation = require('../../locations/TestLocation');
9-
var {
10-
Bar,
11-
Foo
12-
} = require('../../__tests__/TestHandlers');
13-
7+
var { Bar, Foo } = require('../../__tests__/TestHandlers');
148

159
describe('RouteHandler', function () {
1610

0 commit comments

Comments
 (0)