File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change 11var React = require ( 'react' ) ;
2+ var classSet = require ( 'react/lib/cx' ) ;
23var merge = require ( 'react/lib/merge' ) ;
34var ActiveState = require ( '../mixins/ActiveState' ) ;
45var Navigation = require ( '../mixins/Navigation' ) ;
@@ -80,12 +81,15 @@ var Link = React.createClass({
8081 * the value of the activeClassName property when this <Link> is active.
8182 */
8283 getClassName : function ( ) {
83- var className = this . props . className || '' ;
84+ var classNames = { } ;
85+
86+ if ( this . props . className )
87+ classNames [ this . props . className ] = true ;
8488
8589 if ( this . isActive ( this . props . to , this . props . params , this . props . query ) )
86- className += ' ' + this . props . activeClassName ;
90+ classNames [ this . props . activeClassName ] = true ;
8791
88- return className ;
92+ return classSet ( classNames ) ;
8993 } ,
9094
9195 render : function ( ) {
You can’t perform that action at this time.
0 commit comments