File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ var ActiveState = require('../mixins/ActiveState');
33var withoutProperties = require ( '../helpers/withoutProperties' ) ;
44var transitionTo = require ( '../helpers/transitionTo' ) ;
55var makeHref = require ( '../helpers/makeHref' ) ;
6-
6+ var hasOwn = Function . prototype . call . bind ( Object . prototype . hasOwnProperty ) ;
77/**
88 * A map of <Link> component props that are reserved for use by the
99 * router and/or React. All other props are used as params that are
@@ -124,6 +124,13 @@ var Link = React.createClass({
124124 onClick : this . handleClick
125125 } ;
126126
127+ // pull in props without overriding
128+ for ( var propName in this . props ) {
129+ if ( hasOwn ( this . props , propName ) && hasOwn ( props , propName ) === false ) {
130+ props [ propName ] = this . props [ propName ] ;
131+ }
132+ }
133+
127134 return React . DOM . a ( props , this . props . children ) ;
128135 }
129136
You can’t perform that action at this time.
0 commit comments