Merge pull request #444 from moretti/master

Use `react/lib/Object.assign` instead of `react/lib/merge` and `react/lib/copyProperties`

Author: ryanflorence

modules/components/DefaultRoute.js

@@ -1,4 +1,4 @@
-var merge = require('react/lib/merge');
+var objectAssign = require('react/lib/Object.assign');
 var Route = require('./Route');
 
 /**
@@ -9,7 +9,7 @@ var Route = require('./Route');
  */
 function DefaultRoute(props) {
   return Route(
-    merge(props, {
+    objectAssign({}, props, {
       path: null,
       isDefault: true
     })

modules/components/Link.js

@@ -1,6 +1,6 @@
 var React = require('react');
 var classSet = require('react/lib/cx');
-var merge = require('react/lib/merge');
+var objectAssign = require('react/lib/Object.assign');
 var ActiveState = require('../mixins/ActiveState');
 var Navigation = require('../mixins/Navigation');
 
@@ -93,7 +93,7 @@ var Link = React.createClass({
   },
 
   render: function () {
-    var props = merge(this.props, {
+    var props = objectAssign({}, this.props, {
       href: this.getHref(),
       className: this.getClassName(),
       onClick: this.handleClick

modules/components/NotFoundRoute.js

@@ -1,4 +1,4 @@
-var merge = require('react/lib/merge');
+var objectAssign = require('react/lib/Object.assign');
 var Route = require('./Route');
 
 /**
@@ -10,7 +10,7 @@ var Route = require('./Route');
  */
 function NotFoundRoute(props) {
   return Route(
-    merge(props, {
+    objectAssign({}, props, {
       path: null,
       catchAll: true
     })

modules/components/Routes.js

@@ -1,7 +1,7 @@
 var React = require('react');
 var warning = require('react/lib/warning');
 var invariant = require('react/lib/invariant');
-var copyProperties = require('react/lib/copyProperties');
+var objectAssign = require('react/lib/Object.assign');
 var HashLocation = require('../locations/HashLocation');
 var ActiveContext = require('../mixins/ActiveContext');
 var LocationContext = require('../mixins/LocationContext');
@@ -416,7 +416,7 @@ var Routes = React.createClass({
           throw new Error('Passing children to a route handler is not supported');
 
         return route.props.handler(
-          copyProperties(props, addedProps)
+          objectAssign(props, addedProps)
         );
       }.bind(this, props);
     });

modules/mixins/ActiveContext.js

@@ -1,5 +1,5 @@
 var React = require('react');
-var copyProperties = require('react/lib/copyProperties');
+var objectAssign = require('react/lib/Object.assign');
 
 /**
  * A mixin for components that store the active state of routes,
@@ -40,14 +40,14 @@ var ActiveContext = {
    * Returns a read-only object of the currently active URL parameters.
    */
   getActiveParams: function () {
-    return copyProperties({}, this.state.activeParams);
+    return objectAssign({}, this.state.activeParams);
   },
 
   /**
    * Returns a read-only object of the currently active query parameters.
    */
   getActiveQuery: function () {
-    return copyProperties({}, this.state.activeQuery);
+    return objectAssign({}, this.state.activeQuery);
   },
 
   childContextTypes: {

modules/utils/ServerRendering.js

@@ -4,7 +4,7 @@ var ReactMarkupChecksum = require('react/lib/ReactMarkupChecksum');
 var ReactServerRenderingTransaction = require('react/lib/ReactServerRenderingTransaction');
 
 var cloneWithProps = require('react/lib/cloneWithProps');
-var copyProperties = require('react/lib/copyProperties');
+var objectAssign = require('react/lib/Object.assign');
 var instantiateReactComponent = require('react/lib/instantiateReactComponent');
 var invariant = require('react/lib/invariant');
 
@@ -16,7 +16,7 @@ function cloneRoutesForServerRendering(routes) {
 }
 
 function mergeStateIntoInitialProps(state, props) {
-  copyProperties(props, {
+  objectAssign(props, {
     initialPath: state.path,
     initialMatches: state.matches,
     initialActiveRoutes: state.activeRoutes,