From 357a3f3514241530190a6191797cb2fe74206053 Mon Sep 17 00:00:00 2001 From: ruanwz Date: Fri, 22 Aug 2014 12:41:45 +0800 Subject: [PATCH] replace with copyProperties update caused by react-router's change --- src/RouteToMixin.coffee | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/RouteToMixin.coffee b/src/RouteToMixin.coffee index caa26ea..415eb66 100644 --- a/src/RouteToMixin.coffee +++ b/src/RouteToMixin.coffee @@ -2,8 +2,7 @@ React = require 'react' makeHref = require 'react-router/modules/helpers/makeHref' transitionTo = require 'react-router/modules/helpers/transitionTo' withoutProperties = require 'react-router/modules/helpers/withoutProperties' -mergeProperties = require 'react-router/modules/helpers/mergeProperties' - +copyProperties = require 'react/lib/copyProperties' # A map of component props that are reserved for use by the # router and/or React. All other props are used as params that are # interpolated into the link's path. @@ -20,8 +19,8 @@ isModifiedEvent = (event) -> !!(event.metaKey || event.altKey || event.ctrlKey | getUnreservedProps = (props, additionalReservedProps) -> if (additionalReservedProps) - reservedProps = mergeProperties {}, RESERVED_PROPS - reservedProps = mergeProperties reservedProps, additionalReservedProps + reservedProps = copyProperties {}, RESERVED_PROPS + reservedProps = copyProperties reservedProps, additionalReservedProps else reservedProps = RESERVED_PROPS