Merge pull request #175 from brigand/issue-170-dangerouslySetInnerHTML

Merge props passed to Link #170

Author: ryanflorence

docs/api/components/Link.md

@@ -27,6 +27,10 @@ name through the link's properties to the resulting url.
 The className a `Link` receives when it's route is active. Defaults to
 `active`.
 
+### *others*
+
+You can also pass props you'd like to be on the `<a>` such as a title, id, or className.
+
 Example
 -------
 

modules/components/Link.js

@@ -3,7 +3,7 @@ var ActiveState = require('../mixins/ActiveState');
 var withoutProperties = require('../helpers/withoutProperties');
 var transitionTo = require('../helpers/transitionTo');
 var makeHref = require('../helpers/makeHref');
-
+var hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
 /**
  * A map of <Link> component props that are reserved for use by the
  * router and/or React. All other props are used as params that are
@@ -124,6 +124,13 @@ var Link = React.createClass({
       onClick: this.handleClick
     };
 
+    // pull in props without overriding
+    for (var propName in this.props) {
+      if (hasOwn(this.props, propName) && hasOwn(props, propName) === false) {
+        props[propName] = this.props[propName];
+      }
+    }
+
     return React.DOM.a(props, this.props.children);
   }