Skip to content
This repository has been archived by the owner on Jun 5, 2020. It is now read-only.

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexkuz
alexkuz committed Nov 8, 2016
1 parent 95baf31 commit 595467b
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 63 deletions.
74 changes: 37 additions & 37 deletions .eslintrc
View file
@@ -1,46 +1,46 @@
{
"parser": "babel-eslint",
"rules": {
"no-undef": [2],
"no-trailing-spaces": [1],
"space-before-blocks": [1, "always"],
"no-unused-expressions": [0],
"no-underscore-dangle": [0],
"quote-props": [1, "as-needed"],
"no-multi-spaces": [0],
"no-unused-vars": [1],
"no-loop-func": [0],
"key-spacing": [0],
"max-len": [1, 100],
"strict": [0],
"eol-last": [1],
"no-console": [1],
"indent": [1, 2],
"quotes": [1, "single", "avoid-escape"],
"curly": [0],
"jsx-quotes": [1, "prefer-single"],
"no-undef": ["error"],
"no-trailing-spaces": ["warn"],
"space-before-blocks": ["warn", "always"],
"no-unused-expressions": ["off"],
"no-underscore-dangle": ["off"],
"quote-props": ["warn", "as-needed"],
"no-multi-spaces": ["off"],
"no-unused-vars": ["warn"],
"no-loop-func": ["off"],
"key-spacing": ["off"],
"max-len": ["warn", 100],
"strict": ["off"],
"eol-last": ["warn"],
"no-console": ["warn"],
"indent": ["warn", 2],
"quotes": ["warn", "single", "avoid-escape"],
"curly": ["off"],
"jsx-quotes": ["warn", "prefer-single"],

"react/jsx-boolean-value": 1,
"react/jsx-no-undef": 2,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/no-multi-comp": 0,
"react/no-unknown-property": 2,
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 1,
"react/wrap-multilines": 1,
"react/jsx-boolean-value": "warn",
"react/jsx-no-undef": "error",
"react/jsx-uses-react": "warn",
"react/jsx-uses-vars": "warn",
"react/no-did-mount-set-state": "warn",
"react/no-did-update-set-state": "warn",
"react/no-multi-comp": "off",
"react/no-unknown-property": "error",
"react/react-in-jsx-scope": "error",
"react/self-closing-comp": "warn",
"react/jsx-wrap-multilines": "warn",

"generator-star-spacing": 0,
"new-cap": 0,
"object-curly-spacing": 0,
"object-shorthand": 0,
"generator-star-spacing": "off",
"new-cap": "off",
"object-curly-spacing": "off",
"object-shorthand": "off",

"babel/generator-star-spacing": 1,
"babel/new-cap": 1,
"babel/object-curly-spacing": [1, "always"],
"babel/object-shorthand": 1
"babel/generator-star-spacing": "warn",
"babel/new-cap": "warn",
"babel/object-curly-spacing": ["warn", "always"],
"babel/object-shorthand": "warn"
},
"plugins": [
"react",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -2,3 +2,4 @@ node_modules
npm-debug.log
.DS_Store
lib
yarn.lock
45 changes: 29 additions & 16 deletions demo/src/js/DemoApp.jsx
View file
Expand Up @@ -3,7 +3,12 @@ import PageHeader from 'react-bootstrap/lib/PageHeader';
import { connect } from 'react-redux';
import pkg from '../../../package.json';
import Button from 'react-bootstrap/lib/Button';
import Input from 'react-bootstrap/lib/Input';
import FormGroup from 'react-bootstrap/lib/FormGroup';
import FormControl from 'react-bootstrap/lib/FormControl';
import ControlLabel from 'react-bootstrap/lib/ControlLabel';
import Form from 'react-bootstrap/lib/Form';
import Col from 'react-bootstrap/lib/Col';
import InputGroup from 'react-bootstrap/lib/InputGroup';
import Combobox from 'react-input-enhancements/lib/Combobox';
import * as base16 from 'base16';
import * as inspectorThemes from '../../../src/themes';
Expand Down Expand Up @@ -84,21 +89,29 @@ class DemoApp extends React.Component {
<h5>{pkg.description || <span style={styles.muted}>Package Description</span>}</h5>
<div style={styles.links}>
<div style={styles.input}>
<Input ref='theme'
label='Theme:'
addonAfter={
<a onClick={this.toggleTheme}
style={styles.link}>
{options.dark ? 'Light theme' : 'Dark theme'}
</a>
}>
<Combobox options={themeOptions}
defaultValue={options.theme}
onValueChange={value => this.setTheme(options, value)}
optionFilters={[]}>
{props => <input {...props} type='text' className='form-control' />}
</Combobox>
</Input>
<Form horizontal>
<FormGroup>
<Col componentClass={ControlLabel} sm={3}>
Theme:
</Col>
<Col sm={9}>
<InputGroup>
<Combobox options={themeOptions}
value={options.theme}
onValueChange={value => this.setTheme(options, value)}
optionFilters={[]}>
{props => <FormControl {...props} type='text' />}
</Combobox>
<InputGroup.Addon>
<a onClick={this.toggleTheme}
style={styles.link}>
{options.dark ? 'Light theme' : 'Dark theme'}
</a>
</InputGroup.Addon>
</InputGroup>
</Col>
</FormGroup>
</Form>
</div>
</div>
<div style={styles.content}>
Expand Down
19 changes: 10 additions & 9 deletions package.json
View file
Expand Up @@ -25,33 +25,34 @@
"babel": "^6.3.26",
"babel-cli": "^6.4.5",
"babel-core": "^6.4.5",
"babel-eslint": "^4.1.8",
"babel-eslint": "^7.1.0",
"babel-loader": "^6.2.2",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-runtime": "^6.4.3",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
"base16": "^1.0.0",
"chokidar": "^1.6.1",
"clean-webpack-plugin": "^0.1.8",
"eslint": "^1.10.3",
"eslint": "^3.9.1",
"eslint-loader": "^1.2.1",
"eslint-plugin-babel": "^3.1.0",
"eslint-plugin-react": "^3.16.1",
"eslint-plugin-react": "^6.6.0",
"export-files-webpack-plugin": "0.0.1",
"html-webpack-plugin": "^2.8.1",
"imports-loader": "^0.6.5",
"json-loader": "^0.5.4",
"nyan-progress-webpack-plugin": "^1.1.4",
"pre-commit": "^1.1.3",
"raw-loader": "^0.5.1",
"react": "^0.14.7",
"react-bootstrap": "^0.28.2",
"react-dom": "^0.14.7",
"react-input-enhancements": "^0.4.8",
"react": "^15.3.2",
"react-bootstrap": "^0.30.6",
"react-dom": "^15.3.2",
"react-input-enhancements": "^0.5.3",
"react-pure-render": "^1.0.2",
"react-redux": "^4.4.0",
"react-router": "^2.0.1",
"react-router": "^3.0.0",
"react-router-redux": "^4.0.2",
"react-transform-hmr": "^1.0.2",
"redux": "^3.3.1",
Expand All @@ -72,7 +73,7 @@
"hex-rgba": "^1.0.0",
"immutable": "^3.7.6",
"javascript-stringify": "^1.1.0",
"jsondiffpatch": "^0.1.41",
"jsondiffpatch": "^0.2.4",
"jss": "^5.5.6",
"jss-nested": "^2.5.0",
"jss-vendor-prefixer": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/isIterable.js
View file
@@ -1,4 +1,4 @@
export default function isIterable(obj) {
return obj !== null && typeof obj === 'object' && !Array.isArray(obj) &&
typeof obj[Symbol.iterator] === 'function';
typeof obj[window.Symbol.iterator] === 'function';
}

0 comments on commit 595467b

Please sign in to comment.