mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-28 05:05:48 +08:00
Code Issues Actions 43 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jljsj 2015-09-09 14:52:36 +08:00
commit 9b56e3753d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/upload/index.jsx
View File

@ -80,14 +80,19 @@ const AntUpload = React.createClass({
return {
fileList: prevState.fileList.concat(info.file)
};
}, function() {
info.fileList = this.state.fileList;
this.props.onChange(info);
});
} else {
this.setState({
fileList: info.fileList
}, function() {
info.fileList = this.state.fileList;
this.props.onChange(info);
});
}
}
this.props.onChange(info);
},
getDefaultProps() {
return {

5
index.js
View File

@ -1,5 +1,4 @@
import './style/index.less';
import deprecate from 'util-deprecate';
require('./style/index.less');
// matchMedia polyfill for
// https://github.com/WickyNilliams/enquire.js/issues/82
@ -48,7 +47,7 @@ const antd = {
};
// deprecate antd.confirm
antd.confirm = deprecate(antd.confirm, 'antd.confirm() is deprecated, use antd.Modal.confirm() instead');
antd.confirm = require('util-deprecate')(antd.confirm, 'antd.confirm() is deprecated, use antd.Modal.confirm() instead');
module.exports = antd;

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "antd",
"version": "0.9.0-beta4",
"version": "0.9.0-beta6",
"stableVersion": "0.8.0",
"title": "Ant Design",
"description": "一个 UI 设计语言",