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

components/breadcrumb/index.jsx

@@ -52,6 +52,7 @@ const Breadcrumb = React.createClass({
     if (routes && routes.length > 0) {
       const paths = [];
       crumbs = routes.map((route, i) => {
+        route.path = route.path || '';
         let path = route.path.replace(/^\//, '');
         Object.keys(params).forEach(key => {
           path = path.replace(`:${key}`, params[key]);

components/form/demo/search-input.md

@@ -47,12 +47,12 @@ const SearchInput = React.createClass({
       <InputGroup className={searchCls} style={this.props.style}>
         <Input {...this.props} value={this.state.value} onChange={this.handleInputChange}
           onFocus={this.handleFocusBlur} onBlur={this.handleFocusBlur} />
-          <div className="ant-input-group-wrap">
-            <Button className={btnCls} size={this.props.size} onClick={this.handleSearch}>
-              <Icon type="search" />
-            </Button>
-          </div>
-        </InputGroup>
+        <div className="ant-input-group-wrap">
+          <Button className={btnCls} size={this.props.size} onClick={this.handleSearch}>
+            <Icon type="search" />
+          </Button>
+        </div>
+      </InputGroup>
     );
   }
 });

components/menu/index.md

@@ -38,7 +38,7 @@
 | defaultOpenKeys | 初始展开的菜单项 key 数组 |  |      |
 | onSelect | 被选中时调用，参数 {item, key, selectedKeys} 对象 | function | 无   |
 | onDeselect | 取消选中时调用，参数 {item, key, selectedKeys} 对象，仅在 multiple 生效 | function | 无   |
-| onClick | 点击 menuitem 调用此函数，参数为 {item, key} | function | 无 |
+| onClick | 点击 menuitem 调用此函数，参数为 {item, key, keyPath} | function | 无 |
 | style | 根节点样式 | object | | |
 
 ### Menu.Item props

components/upload/demo/basic.md

@@ -12,6 +12,9 @@ import { Upload, message, Button, Icon } from 'antd';
 const props = {
   name: 'file',
   action: '/upload.do',
+  headers: {
+    authorization: 'authorization-text',
+  },
   onChange(info) {
     if (info.file.status !== 'uploading') {
       console.log(info.file, info.fileList);

style/components/menu.less

@@ -307,6 +307,8 @@
   &-dark&-horizontal > &-item,
   &-dark&-horizontal > &-submenu {
     border-color: #404040;
+    border-bottom: 0;
+    top: 0;
   }
 
   &-dark&-horizontal > &-item-active,

style/components/pagination.less

@@ -1,7 +1,6 @@
 @pagination-prefix-cls: ant-pagination;
 
 .@{pagination-prefix-cls} {
-  user-select: none;
   font-size: @font-size-base;
 
   &:after {
@@ -23,6 +22,7 @@
   &-item {
     cursor: pointer;
     border-radius: @border-radius-base;
+    user-select: none;
     min-width: 28px;
     height: 28px;
     line-height: 28px;