Skip to content

replace with copyProperties #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtscout6 merged 1 commit into from
Aug 22, 2014
Merged

replace with copyProperties #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/RouteToMixin.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down