test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-02 20:19:44 +08:00
Code Issues Actions 84 Packages Projects Releases Wiki Activity

Merge pull request #369 from benjycui/feature-react@0.14.x

Browse Source 
fix: antd build fail
This commit is contained in:
偏右 2015-10-09 12:19:03 +08:00
commit a52de54748
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/affix/index.jsx
View File

@ -1,5 +1,4 @@
import React from 'react'; import React from 'react';
import joinClasses from 'react/lib/joinClasses';
import rcUtil from 'rc-util'; import rcUtil from 'rc-util';
function getScroll(w, top) { function getScroll(w, top) {
@ -89,12 +88,14 @@ let Affix = React.createClass({
}, },
render() { render() {
let affix = this.state.affix ? 'ant-affix' : ''; const className = rcUtil.classSet({
let className = this.props.className; [this.props.className]: this.props.className,
'ant-affix': this.state.affix
});
return ( return (
<div {...this.props}> <div {...this.props}>
<div className={joinClasses(className, affix)} style={this.state.affixStyle}> <div className={className} style={this.state.affixStyle}>
{this.props.children} {this.props.children}
</div> </div>
</div> </div>

2
package.json
View File

@ -60,7 +60,7 @@
"rc-tree": "~0.15.4", "rc-tree": "~0.15.4",
"rc-upload": "~1.6.4", "rc-upload": "~1.6.4",
"rc-util": "~2.0.3", "rc-util": "~2.0.3",
"react-slick": "~0.7.0", "react-slick": "~0.8.0",
"reqwest-without-xhr2": "~2.0.2", "reqwest-without-xhr2": "~2.0.2",
"util-deprecate": "~1.0.1", "util-deprecate": "~1.0.1",
"velocity-animate": "~1.2.2" "velocity-animate": "~1.2.2"