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

components/upload/index.jsx

@@ -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 {

index.js

@@ -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;
 

package.json

@@ -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 设计语言",