File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11var React = require ( 'react' ) ;
22var warning = require ( 'react/lib/warning' ) ;
33var invariant = require ( 'react/lib/invariant' ) ;
4- var copyProperties = require ( 'react/lib/copyProperties ' ) ;
4+ var objectAssign = require ( 'react/lib/Object.assign ' ) ;
55var HashLocation = require ( '../locations/HashLocation' ) ;
66var ActiveContext = require ( '../mixins/ActiveContext' ) ;
77var LocationContext = require ( '../mixins/LocationContext' ) ;
@@ -416,7 +416,7 @@ var Routes = React.createClass({
416416 throw new Error ( 'Passing children to a route handler is not supported' ) ;
417417
418418 return route . props . handler (
419- copyProperties ( props , addedProps )
419+ objectAssign ( props , addedProps )
420420 ) ;
421421 } . bind ( this , props ) ;
422422 } ) ;
Original file line number Diff line number Diff line change 11var React = require ( 'react' ) ;
2- var copyProperties = require ( 'react/lib/copyProperties ' ) ;
2+ var objectAssign = require ( 'react/lib/Object.assign ' ) ;
33
44/**
55 * A mixin for components that store the active state of routes,
@@ -40,14 +40,14 @@ var ActiveContext = {
4040 * Returns a read-only object of the currently active URL parameters.
4141 */
4242 getActiveParams : function ( ) {
43- return copyProperties ( { } , this . state . activeParams ) ;
43+ return objectAssign ( { } , this . state . activeParams ) ;
4444 } ,
4545
4646 /**
4747 * Returns a read-only object of the currently active query parameters.
4848 */
4949 getActiveQuery : function ( ) {
50- return copyProperties ( { } , this . state . activeQuery ) ;
50+ return objectAssign ( { } , this . state . activeQuery ) ;
5151 } ,
5252
5353 childContextTypes : {
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ var ReactMarkupChecksum = require('react/lib/ReactMarkupChecksum');
44var ReactServerRenderingTransaction = require ( 'react/lib/ReactServerRenderingTransaction' ) ;
55
66var cloneWithProps = require ( 'react/lib/cloneWithProps' ) ;
7- var copyProperties = require ( 'react/lib/copyProperties ' ) ;
7+ var objectAssign = require ( 'react/lib/Object.assign ' ) ;
88var instantiateReactComponent = require ( 'react/lib/instantiateReactComponent' ) ;
99var invariant = require ( 'react/lib/invariant' ) ;
1010
@@ -16,7 +16,7 @@ function cloneRoutesForServerRendering(routes) {
1616}
1717
1818function mergeStateIntoInitialProps ( state , props ) {
19- copyProperties ( props , {
19+ objectAssign ( props , {
2020 initialPath : state . path ,
2121 initialMatches : state . matches ,
2222 initialActiveRoutes : state . activeRoutes ,
You can’t perform that action at this time.
0 commit comments