Merge branch '1.x-stable'

pull/2207/merge
afc163 9 years ago
commit 21fb73d4f2

@ -29,7 +29,7 @@ export default class Alert extends React.Component {
this.setState({
closing: false,
});
this.props.onClose.call(this, e);
this.props.onClose(e);
}
animationEnd = () => {
this.setState({

@ -24,7 +24,7 @@ export default class DropdownButton extends React.Component {
['type', 'overlay', 'trigger', 'align', 'children', 'className', 'onClick']);
const cls = classNames({
'ant-dropdown-button': true,
className: !!className,
[className]: !!className,
});
return (
<ButtonGroup {...restProps} className={cls}>

@ -274,7 +274,7 @@ form {
visibility: visible;
font-family: "anticon" !important;
.square(@input-height-lg);
line-height: @input-height-lg + 2;
line-height: @input-height-lg;
text-align: center;
font-size: 14px;
animation: zoomIn .3s @ease-out-back;

@ -25,10 +25,9 @@ export default class Tag extends React.Component {
this.props.onClose(e);
if (e.defaultPrevented) return;
const dom = ReactDOM.findDOMNode(this);
const domWidth = dom.getBoundingClientRect().width;
dom.style.width = `${domWidth}px`;
dom.style.width = `${dom.getBoundingClientRect().width}px`;
// It's Magic Code, don't know why
dom.style.width = `${domWidth}px`;
dom.style.width = `${dom.getBoundingClientRect().width}px`;
this.setState({
closing: true,
});

Loading…
Cancel
Save