diff --git a/.eslintrc b/.eslintrc index 32c6d3f3..deff2827 100644 --- a/.eslintrc +++ b/.eslintrc @@ -17,6 +17,7 @@ "parser": "babel-eslint", "plugins": [ + "babel", "react" ], @@ -168,6 +169,7 @@ "operator-linebreak": [2, "after"], "padded-blocks": [0], "prefer-const": [2], + "prefer-spread": [2], "quote-props": [0], "radix": [0], "semi": [2], @@ -210,6 +212,7 @@ }], "react/jsx-uses-react": [2], "react/jsx-uses-vars": [2], - "react/react-in-jsx-scope": [2] + "react/react-in-jsx-scope": [2], + "babel/object-shorthand": [2] } } diff --git a/components/button/index.jsx b/components/button/index.jsx index 5c0533e2..e4dd1706 100644 --- a/components/button/index.jsx +++ b/components/button/index.jsx @@ -51,8 +51,9 @@ class Button extends React.Component { }; render () { - const {accent, flat, floating, href, icon, label, loading, mini, - primary, raised, ripple, toggle, tooltip, tooltipDelay, ...others} = this.props; + const {accent, flat, floating, href, icon, label, + loading, mini, primary, raised, ripple, toggle, + tooltip, tooltipDelay, ...others} = this.props; //eslint-disable-line no-redeclare const element = href ? 'a' : 'button'; const level = primary ? 'primary' : accent ? 'accent' : 'neutral'; const shape = flat ? 'flat' : raised ? 'raised' : floating ? 'floating' : toggle ? 'toggle' : 'flat'; diff --git a/components/dropdown/index.jsx b/components/dropdown/index.jsx index c2d435c7..8e2c929c 100644 --- a/components/dropdown/index.jsx +++ b/components/dropdown/index.jsx @@ -28,7 +28,7 @@ class Dropdown extends React.Component { const client = event.target.getBoundingClientRect(); const screen_height = window.innerHeight || document.documentElement.offsetHeight; const up = this.props.auto ? client.top > ((screen_height / 2) + client.height) : false; - this.setState({active: true, up: up}); + this.setState({active: true, up}); }; handleSelect = (item) => { diff --git a/components/slider/__tests__/index.spec.jsx b/components/slider/__tests__/index.spec.jsx index e5e3d85e..07011034 100644 --- a/components/slider/__tests__/index.spec.jsx +++ b/components/slider/__tests__/index.spec.jsx @@ -103,7 +103,7 @@ describe('Slider', function () { describe('#events', function () { beforeEach(function () { onChange = sinon.spy(); - props = { min: -500, max: 500, onChange: onChange }; + props = { min: -500, max: 500, onChange }; state = { sliderStart: 0, sliderLength: 1000 }; slider = utils.renderComponent(Slider, props, state); slider.handleResize = (event, callback) => { callback(); }; diff --git a/docs/app/components/preview/index.jsx b/docs/app/components/preview/index.jsx index d1badd05..f8e0a52d 100644 --- a/docs/app/components/preview/index.jsx +++ b/docs/app/components/preview/index.jsx @@ -39,7 +39,7 @@ const Preview = React.createClass({ setTimeout () { clearTimeout(this.timeoutID); - this.timeoutID = setTimeout.apply(null, arguments); + this.timeoutID = setTimeout(...arguments); }, compileCode () { @@ -72,7 +72,7 @@ const Preview = React.createClass({ const compiledCode = this.compileCode(); /*eslint-disable no-eval*/ - const Component = eval(compiledCode).apply(null, scope); + const Component = eval(compiledCode)(...scope); ReactDOM.render(Component, mountNode); if (this.state.error) { this.setState({error: null}); diff --git a/package.json b/package.json index 6b99c17d..32a827a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-toolbox", "version": "0.12.12", - "homepage": "www.react-toolbox.com", + "homepage": "http://www.react-toolbox.com", "description": "A set of React components implementing Google's Material Design specification with the power of CSS Modules.", "author": "React Toolbox Team (http://github.com/react-toolbox)", "contributors": [ @@ -53,15 +53,16 @@ "autoprefixer": "^6.0.3", "babel": "^5.8.23", "babel-core": "^5.8.23", - "babel-eslint": "^4.1.3", + "babel-eslint": "^4.1.5", "babel-loader": "^5.3.2", "babel-plugin-react-transform": "^1.1.1", "core-js": "^1.2.6", "cpx": "^1.2.1", "cross-env": "^1.0.4", "css-loader": "^0.21.0", - "eslint": "^1.7.3", - "eslint-plugin-react": "^3.3.1", + "eslint": "^1.10.1", + "eslint-plugin-babel": "^2.1.1", + "eslint-plugin-react": "^3.10.0", "expect": "^1.8.0", "express": "^4.13.3", "extract-text-webpack-plugin": "^0.8.2",