From 8116e775ff4fe86f41894845fdec310b95f2b512 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 18 Apr 2016 14:58:38 +0800 Subject: [PATCH] upgrade devDeps and fix some eslint problems --- components/breadcrumb/Breadcrumb.jsx | 2 +- components/card/demo/no-padding.md | 2 +- components/queue-anim/demo/page.md | 2 +- components/upload/demo/picture-card.md | 4 +-- components/upload/index.jsx | 37 +++++++++++++------------- package.json | 9 ++++--- site/component/Header/index.jsx | 2 +- site/component/ImagePreview/index.jsx | 4 +-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/components/breadcrumb/Breadcrumb.jsx b/components/breadcrumb/Breadcrumb.jsx index 45a228a396..fe74ad494b 100644 --- a/components/breadcrumb/Breadcrumb.jsx +++ b/components/breadcrumb/Breadcrumb.jsx @@ -39,7 +39,7 @@ export default class Breadcrumb extends React.Component { if (!route.breadcrumbName) { return null; } - const name = route.breadcrumbName.replace(/\:(.*)/g, (replacement, key) => { + const name = route.breadcrumbName.replace(/:(.*)/g, (replacement, key) => { return params[key] || replacement; }); diff --git a/components/card/demo/no-padding.md b/components/card/demo/no-padding.md index 512caeca33..ed8b37312f 100644 --- a/components/card/demo/no-padding.md +++ b/components/card/demo/no-padding.md @@ -11,7 +11,7 @@ import { Card } from 'antd'; ReactDOM.render(
- + example

欧美街拍

diff --git a/components/queue-anim/demo/page.md b/components/queue-anim/demo/page.md index c9b60e5c4c..96a36c61b6 100644 --- a/components/queue-anim/demo/page.md +++ b/components/queue-anim/demo/page.md @@ -23,7 +23,7 @@ const Test = React.createClass({ const page = this.state.show ? [
- + logo logo
diff --git a/components/upload/demo/picture-card.md b/components/upload/demo/picture-card.md index f55f78e780..0e742466db 100644 --- a/components/upload/demo/picture-card.md +++ b/components/upload/demo/picture-card.md @@ -45,11 +45,11 @@ const ImageUploadList = React.createClass({
上传照片
- + example 示例 - + example
); diff --git a/components/upload/index.jsx b/components/upload/index.jsx index c1b5666077..7a6e251e3b 100644 --- a/components/upload/index.jsx +++ b/components/upload/index.jsx @@ -269,34 +269,33 @@ export default class Upload extends React.Component { {uploadList} ); - } else if (type === 'select') { - const uploadButtonCls = classNames({ - [prefixCls]: true, - [`${prefixCls}-select`]: true, - [`${prefixCls}-select-${this.props.listType}`]: true, - }); - if (this.props.listType === 'picture-card') { - return ( - - {uploadList} -
- - {this.props.children} - -
-
- ); - } + } + const uploadButtonCls = classNames({ + [prefixCls]: true, + [`${prefixCls}-select`]: true, + [`${prefixCls}-select-${this.props.listType}`]: true, + }); + if (this.props.listType === 'picture-card') { return ( + {uploadList}
{this.props.children}
- {uploadList}
); } + return ( + +
+ + {this.props.children} + +
+ {uploadList} +
+ ); } } diff --git a/package.json b/package.json index 2b0ee5f2d9..4b2fc7b4ac 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "rc-slider": "~3.5.1", "rc-steps": "~2.0.0", "rc-switch": "~1.4.0", - "rc-table": "~4.0.0-beta.3", + "rc-table": "~4.0.0", "rc-tabs": "~5.8.0", "rc-time-picker": "~1.1.0", "rc-tooltip": "~3.3.2", @@ -92,8 +92,9 @@ "enquire.js": "^2.1.1", "es6-shim": "^0.35.0", "eslint": "^2.2.0", - "eslint-config-airbnb": "^6.0.1", + "eslint-config-airbnb": "^7.0.0", "eslint-plugin-babel": "^3.0.0", + "eslint-plugin-jsx-a11y": "^0.6.2", "eslint-plugin-markdown": "*", "eslint-plugin-react": "^4.0.0", "eslint-tinker": "^0.3.1", @@ -108,7 +109,7 @@ "mkdirp": "~0.5.1", "pre-commit": "1.x", "querystring": "^0.2.0", - "ramda": "^0.20.1", + "ramda": "^0.21.0", "rc-scroll-anim": "0.2.x", "rc-tween-one": "0.2.x", "react": "^15.0.0", @@ -118,7 +119,7 @@ "react-github-button": "^0.1.1", "react-router": "^2.0.0", "react-stateless-wrapper": "^1.0.2", - "react-sublime-video": "^0.1.0", + "react-sublime-video": "^0.2.0-beta", "reqwest": "^2.0.5", "values.js": "^1.0.3", "webpack-babel-jest": "^1.0.4" diff --git a/site/component/Header/index.jsx b/site/component/Header/index.jsx index 974c2183df..6db2057ee6 100644 --- a/site/component/Header/index.jsx +++ b/site/component/Header/index.jsx @@ -86,7 +86,7 @@ export default class Header extends React.Component { onClick={this.handleMenuIconClick} type="menu" /> - + logo Ant Design diff --git a/site/component/ImagePreview/index.jsx b/site/component/ImagePreview/index.jsx index 85650c315a..0ed00f4a3d 100644 --- a/site/component/ImagePreview/index.jsx +++ b/site/component/ImagePreview/index.jsx @@ -17,7 +17,7 @@ function PreviewImageBox({ cover, coverMeta, imgs, style, previewVisible, style={style} onClick={onClick}>
- Sample Picture + {coverMeta.alt}
{coverMeta.alt}
- + {meta.alt}
);