Merge branch 'master' of github.com:ant-design/ant-design

.eslintrc.json

@@ -29,7 +29,6 @@
     "react/jsx-closing-bracket-location": 0,
     "react/jsx-no-bind": 0,
     "no-param-reassign": 0,
-    "max-len": 0,
-    "object-shorthand": 0
+    "max-len": 0
   }
 }

components/modal/demo/confirm.md

@@ -14,10 +14,10 @@ function showConfirm() {
   confirm({
     title: '您是否确认要删除这项内容',
     content: '一些解释',
-    onOk: function () {
+    onOk() {
       console.log('确定');
     },
-    onCancel: function () {}
+    onCancel() {}
   });
 }
 

components/modal/demo/footer.md

@@ -10,7 +10,7 @@
 import { Modal, Button } from 'antd';
 
 const Test = React.createClass({
-  getInitialState: function () {
+  getInitialState() {
     return {
       loading: false,
       visible: false

components/modal/demo/info.md

@@ -13,7 +13,7 @@ function info() {
   Modal.info({
     title: '这是一条通知信息',
     content: '一些附加信息一些附加信息一些附加信息',
-    onOk: function () {}
+    onOk() {}
   });
 }
 

components/notification/demo/with-btn.md

@@ -27,8 +27,8 @@ const openNotification = function () {
   notification.open({
     message: '这是标题',
     description: '这是提示框的文案这是提示框示框的文案这是提示是提示框的文案这是提示框的文案',
-    btn: btn,
-    key: key,
+    btn,
+    key,
     onClose: close
   });
 };

components/queue-anim/demo/change.md

@@ -30,7 +30,7 @@ const Test = React.createClass({
     items.push(<li key={Date.now()}></li>);
     this.setState({
       show: true,
-      items: items,
+      items,
     });
   },
   onRemove() {
@@ -38,7 +38,7 @@ const Test = React.createClass({
     items.splice(items.length - 1, 1);
     this.setState({
       show: true,
-      items: items,
+      items,
     });
   },
   render() {

components/queue-anim/demo/router.md

@@ -29,7 +29,7 @@ const App = React.createClass({
           </Menu.Item>
         </Menu>
         <QueueAnim type={['right', 'left']} className="demo-router-wrap">
-          {React.cloneElement(this.props.children || <Home/>, { key: key })}
+          {React.cloneElement(this.props.children || <Home/>, { key })}
         </QueueAnim>
       </div>
     );

components/radio/demo/radiogroup.md

@@ -11,7 +11,7 @@ import { Radio } from 'antd';
 const RadioGroup = Radio.Group;
 
 const App = React.createClass({
-  getInitialState: function () {
+  getInitialState() {
     return {
       value: 'a'
     };

components/slider/demo/icon-slider.md

@@ -18,7 +18,7 @@ const IconSlider = React.createClass({
     return {
       preIconClass: this.props.value >= mid ? '' : 'anticon-highlight',
       nextIconClass: this.props.value >= mid ? 'anticon-highlight' : '',
-      mid: mid,
+      mid,
       sliderValue: this.props.value
     };
   },

components/table/demo/basic.md

@@ -13,7 +13,7 @@ const columns = [{
   title: '姓名',
   dataIndex: 'name',
   key: 'name',
-  render: function (text) {
+  render(text) {
     return <a href="#">{text}</a>;
   }
 }, {
@@ -27,7 +27,7 @@ const columns = [{
 }, {
   title: '操作',
   key: 'operation',
-  render: function (text, record) {
+  render(text, record) {
     return (
       <span>
         <a href="#">操作一{record.name}</a>

components/table/demo/bordered.md

@@ -12,7 +12,7 @@ import { Table } from 'antd';
 const columns = [{
   title: '姓名',
   dataIndex: 'name',
-  render: function (text) {
+  render(text) {
     return <a href="#">{text}</a>;
   }
 }, {

components/table/demo/colspan-rowspan.md

@@ -27,7 +27,7 @@ const renderContent = function (value, row, index) {
 const columns = [{
   title: '姓名',
   dataIndex: 'name',
-  render: function (text, row, index) {
+  render(text, row, index) {
     if (index < 4) {
       return <a href="#">{text}</a>;
     }
@@ -46,7 +46,7 @@ const columns = [{
   title: '家庭电话',
   colSpan: 2,
   dataIndex: 'tel',
-  render: function (value, row, index) {
+  render(value, row, index) {
     let obj = {
       children: value,
       props: {}

components/table/demo/head.md

@@ -33,16 +33,16 @@ const columns = [{
   }],
   // 指定确定筛选的条件函数
   // 这里是名字中第一个字是 value
-  onFilter: function (value, record) {
+  onFilter(value, record) {
     return record.name.indexOf(value) === 0;
   },
-  sorter: function (a, b) {
+  sorter(a, b) {
     return a.name.length - b.name.length;
   }
 }, {
   title: '年龄',
   dataIndex: 'age',
-  sorter: function (a, b) {
+  sorter(a, b) {
     return a.age - b.age;
   }
 }, {
@@ -56,10 +56,10 @@ const columns = [{
     value: '西湖'
   }],
   filterMultiple: false,
-  onFilter: function (value, record) {
+  onFilter(value, record) {
     return record.address.indexOf(value) === 0;
   },
-  sorter: function (a, b) {
+  sorter(a, b) {
     return a.address.length - b.address.length;
   }
 }];

components/table/demo/paging.md

@@ -12,7 +12,7 @@ import { Table } from 'antd';
 const columns = [{
   title: '姓名',
   dataIndex: 'name',
-  render: function (text) {
+  render(text) {
     return <a href="#">{text}</a>;
   }
 }, {
@@ -37,10 +37,10 @@ const pagination = {
   total: data.length,
   current: 1,
   showSizeChanger: true,
-  onShowSizeChange: function (current, pageSize) {
+  onShowSizeChange(current, pageSize) {
     console.log('Current: ', current, '; PageSize: ', pageSize);
   },
-  onChange: function (current) {
+  onChange(current) {
     console.log('Current: ', current);
   }
 };

components/table/demo/row-selection-props.md

@@ -12,7 +12,7 @@ import { Table } from 'antd';
 const columns = [{
   title: '姓名',
   dataIndex: 'name',
-  render: function (text) {
+  render(text) {
     return <a href="#">{text}</a>;
   }
 }, {
@@ -41,7 +41,7 @@ const data = [{
 
 // 通过 rowSelection 对象表明需要行选择
 const rowSelection = {
-  getCheckboxProps: function (record) {
+  getCheckboxProps(record) {
     return {
       defaultChecked: record.name === '李大嘴', // 配置默认勾选的列
       disabled: record.name === '胡彦祖'    // 配置无法勾选的列
@@ -50,10 +50,10 @@ const rowSelection = {
   onChange(selectedRowKeys) {
     console.log('selectedRowKeys changed: ' + selectedRowKeys);
   },
-  onSelect: function (record, selected, selectedRows) {
+  onSelect(record, selected, selectedRows) {
     console.log(record, selected, selectedRows);
   },
-  onSelectAll: function (selected, selectedRows) {
+  onSelectAll(selected, selectedRows) {
     console.log(selected, selectedRows);
   },
 };

components/table/demo/row-selection.md

@@ -12,7 +12,7 @@ import { Table } from 'antd';
 const columns = [{
   title: '姓名',
   dataIndex: 'name',
-  render: function (text) {
+  render(text) {
     return <a href="#">{text}</a>;
   }
 }, {
@@ -44,10 +44,10 @@ const rowSelection = {
   onChange(selectedRowKeys) {
     console.log('selectedRowKeys changed: ' + selectedRowKeys);
   },
-  onSelect: function (record, selected, selectedRows) {
+  onSelect(record, selected, selectedRows) {
     console.log(record, selected, selectedRows);
   },
-  onSelectAll: function (selected, selectedRows) {
+  onSelectAll(selected, selectedRows) {
     console.log(selected, selectedRows);
   }
 };

components/tabs/demo/editable-card.md

@@ -19,7 +19,7 @@ const Demo = React.createClass({
     ];
     return {
       activeKey: panes[0].key,
-      panes: panes,
+      panes,
     };
   },
   onChange(activeKey) {

components/tree/demo/basic-controlled.md

@@ -22,7 +22,7 @@ const generateData = (_level, _preKey, _tns) => {
   const children = [];
   for (let i = 0; i < x; i++) {
     const key = `${preKey}-${i}`;
-    tns.push({ title: key, key: key });
+    tns.push({ title: key, key });
     if (i < y) {
       children.push(key);
     }

components/tree/demo/draggable.md

@@ -22,7 +22,7 @@ const generateData = (_level, _preKey, _tns) => {
   const children = [];
   for (let i = 0; i < x; i++) {
     const key = `${preKey}-${i}`;
-    tns.push({ title: key, key: key });
+    tns.push({ title: key, key });
     if (i < y) {
       children.push(key);
     }

components/upload/demo/beforeUpload.md

@@ -11,7 +11,7 @@ import { Upload, Button, Icon, message } from 'antd';
 
 const props = {
   action: '/upload.do',
-  beforeUpload: function (file) {
+  beforeUpload(file) {
     const isJPG = file.type === 'image/jpeg';
     if (!isJPG) {
       message.error('只能上传 JPG 文件哦！');