From 29825f20c83f42a7c394aa75f19dfb87edb362d0 Mon Sep 17 00:00:00 2001 From: Benjy Cui Date: Wed, 17 Feb 2016 18:04:42 +0800 Subject: [PATCH] style: update code style to please lint --- .eslintrc.json | 1 - components/affix/index.jsx | 4 +-- components/alert/index.jsx | 18 ++++++------ components/badge/ScrollNumber.jsx | 2 +- components/badge/index.jsx | 2 +- components/breadcrumb/index.jsx | 10 +++---- components/button/button.jsx | 2 +- components/calendar/index.jsx | 6 ++-- components/carousel/index.jsx | 2 +- components/checkbox/demo/basic.md | 2 +- components/checkbox/demo/controller.md | 3 +- components/date-picker/index.jsx | 2 +- components/dropdown/demo/event.md | 2 +- components/form/FormItem.jsx | 8 +++--- components/form/ValueMixin.jsx | 2 +- components/form/demo/form-controls.md | 2 +- components/input/index.jsx | 7 +++-- components/layout/col.jsx | 10 +++---- components/layout/row.jsx | 6 ++-- components/menu/index.jsx | 2 +- components/message/index.jsx | 2 +- components/notification/demo/with-btn.md | 2 +- components/notification/index.jsx | 16 +++++------ components/popconfirm/index.jsx | 6 ++-- components/popover/index.jsx | 4 +-- components/progress/demo/format.md | 2 +- components/progress/index.jsx | 28 +++++++++---------- components/radio/demo/radiobutton.md | 2 +- components/radio/demo/radiogroup.md | 2 +- components/radio/radio.jsx | 4 +-- components/select/demo/basic.md | 2 +- components/select/demo/combobox.md | 2 +- components/select/demo/multiple.md | 2 +- components/select/demo/optgroup.md | 2 +- components/select/demo/search.md | 2 +- components/select/demo/size.md | 2 +- components/select/demo/tags.md | 2 +- components/slider/demo/tip-formatter.md | 2 +- components/spin/index.jsx | 4 +-- components/steps/demo/step-next.md | 2 +- components/switch/demo/basic.md | 2 +- components/table/demo/fixed-header.md | 4 +-- components/table/demo/paging.md | 4 +-- .../table/demo/row-selection-and-operation.md | 4 +-- components/table/demo/row-selection-props.md | 2 +- components/table/demo/row-selection.md | 2 +- components/table/index.jsx | 10 +++---- components/tabs/demo/editable-card.md | 2 +- components/tabs/index.jsx | 10 +++---- components/tag/demo/control.md | 2 +- components/tag/index.jsx | 12 ++++---- components/time-picker/index.jsx | 2 +- components/timeline/index.jsx | 14 +++++----- components/transfer/demo/advanced.md | 6 ++-- components/transfer/demo/basic.md | 4 +-- components/transfer/demo/search.md | 4 +-- components/transfer/index.jsx | 16 +++++------ components/transfer/list.jsx | 4 +-- components/transfer/search.jsx | 6 ++-- components/upload/demo/basic.md | 4 +-- components/upload/demo/multiple.md | 4 +-- components/upload/index.jsx | 9 +++--- components/upload/uploadList.jsx | 14 +++++----- 63 files changed, 162 insertions(+), 162 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f676ea14d3..caf7efe8d6 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,7 +20,6 @@ "comma-dangle": 0, "func-names": 0, "prefer-const": 0, - "prefer-template": 0, "arrow-body-style": 0, "react/sort-comp": 0, "react/no-multi-comp": 0, diff --git a/components/affix/index.jsx b/components/affix/index.jsx index c8a1f41855..0c8eb35f65 100644 --- a/components/affix/index.jsx +++ b/components/affix/index.jsx @@ -4,8 +4,8 @@ import rcUtil from 'rc-util'; import classNames from 'classnames'; function getScroll(w, top) { - let ret = w['page' + (top ? 'Y' : 'X') + 'Offset']; - let method = 'scroll' + (top ? 'Top' : 'Left'); + let ret = w[`page${top ? 'Y' : 'X'}Offset`]; + let method = `scroll${top ? 'Top' : 'Left'}`; if (typeof ret !== 'number') { let d = w.document; // ie6,7,8 standard mode diff --git a/components/alert/index.jsx b/components/alert/index.jsx index 91c0f8ad23..566718731e 100644 --- a/components/alert/index.jsx +++ b/components/alert/index.jsx @@ -21,10 +21,10 @@ export default React.createClass({ handleClose(e) { e.preventDefault(); let dom = ReactDOM.findDOMNode(this); - dom.style.height = dom.offsetHeight + 'px'; + dom.style.height = `${dom.offsetHeight}px`; // Magic code // 重复一次后才能正确设置 height - dom.style.height = dom.offsetHeight + 'px'; + dom.style.height = `${dom.offsetHeight}px`; this.setState({ closing: false @@ -67,10 +67,10 @@ export default React.createClass({ let alertCls = classNames({ [prefixCls]: true, - [prefixCls + '-' + type]: true, - [prefixCls + '-close']: !this.state.closing, - [prefixCls + '-with-description']: !!description, - [prefixCls + '-no-icon']: !showIcon, + [`${prefixCls}-${type}`]: true, + [`${prefixCls}-close`]: !this.state.closing, + [`${prefixCls}-with-description`]: !!description, + [`${prefixCls}-no-icon`]: !showIcon, }); // closeable when closeText is assigned @@ -85,9 +85,9 @@ export default React.createClass({ onEnd={this.animationEnd}>
{showIcon ? : null} - {message} - {description} - {closable ? + {message} + {description} + {closable ? {closeText || } : null}
diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx index 070efb16d9..9b91e788a3 100644 --- a/components/badge/ScrollNumber.jsx +++ b/components/badge/ScrollNumber.jsx @@ -76,7 +76,7 @@ class AntScrollNumber extends React.Component { className: `${this.props.prefixCls}-only`, style: { transition: removeTransition && 'none', - transform: 'translate3d(0, ' + (-position * height) + 'px, 0)', + transform: `translate3d(0, ${-position * height}px, 0)`, height, }, key: i, diff --git a/components/badge/index.jsx b/components/badge/index.jsx index c21399709e..cd51874288 100644 --- a/components/badge/index.jsx +++ b/components/badge/index.jsx @@ -33,7 +33,7 @@ class AntBadge extends React.Component { {children} { hidden ? null : diff --git a/components/breadcrumb/index.jsx b/components/breadcrumb/index.jsx index ab13e1e724..f9e0f8bd23 100644 --- a/components/breadcrumb/index.jsx +++ b/components/breadcrumb/index.jsx @@ -17,14 +17,14 @@ const BreadcrumbItem = React.createClass({ }, render() { const { prefixCls, separator, children } = this.props; - let link = {children}; + let link = {children}; if (typeof this.props.href === 'undefined') { - link = {children}; + link = {children}; } return ( {link} - {separator} + {separator} ); } @@ -62,7 +62,7 @@ const Breadcrumb = React.createClass({ let link; let path = route.path.replace(/^\//, ''); Object.keys(params).forEach(key => { - path = path.replace(':' + key, params[key]); + path = path.replace(`:${key}`, params[key]); }); if (path) { paths.push(path); @@ -71,7 +71,7 @@ const Breadcrumb = React.createClass({ if (i === routes.length - 1) { link = {name}; } else { - link = {name}; + link = {name}; } return {link}; }); diff --git a/components/button/button.jsx b/components/button/button.jsx index 43b33c2d79..b9e7ec6110 100644 --- a/components/button/button.jsx +++ b/components/button/button.jsx @@ -46,7 +46,7 @@ export default class Button extends React.Component { [prefix + type]: type, [prefix + shape]: shape, [prefix + sizeCls]: sizeCls, - [prefix + 'loading']: ('loading' in props && props.loading !== false), + [`${prefix}loading`]: ('loading' in props && props.loading !== false), [className]: className }); diff --git a/components/calendar/index.jsx b/components/calendar/index.jsx index e1dd790b14..cd6266b06f 100644 --- a/components/calendar/index.jsx +++ b/components/calendar/index.jsx @@ -8,8 +8,8 @@ import Header from './Header'; function noop() { return null; } function zerofixed(v) { - if (v < 10) return '0' + v; - return v + ''; + if (v < 10) return `0${v}`; + return `${v}`; } class Calendar extends Component { @@ -80,7 +80,7 @@ class Calendar extends Component { let cls = className || ''; if (fullscreen) { - cls += (' ' + prefixCls + '-fullscreen'); + cls += (` ${prefixCls}-fullscreen`); } return ( diff --git a/components/carousel/index.jsx b/components/carousel/index.jsx index c534745eab..a994d46d90 100644 --- a/components/carousel/index.jsx +++ b/components/carousel/index.jsx @@ -34,7 +34,7 @@ const AntCarousel = React.createClass({ let className = 'ant-carousel'; if (props.vertical) { - className = className + ' ant-carousel-vertical'; + className = `${className} ant-carousel-vertical`; } return ( diff --git a/components/checkbox/demo/basic.md b/components/checkbox/demo/basic.md index eea91c1169..b642019a4b 100644 --- a/components/checkbox/demo/basic.md +++ b/components/checkbox/demo/basic.md @@ -10,7 +10,7 @@ import { Checkbox } from 'antd'; function onChange(e) { - console.log('checked = ' + e.target.checked); + console.log(`checked = ${e.target.checked}`); } ReactDOM.render(