[changed] use Object.assign instead of merge

danieljuhl · Oct 31, 2014 · f8cb7f9 · f8cb7f9
1 parent 9804a78
commit f8cb7f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/modules/components/DefaultRoute.js b/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
     })

diff --git a/modules/components/Link.js b/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

diff --git a/modules/components/NotFoundRoute.js b/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
     })