Skip to content
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

Jump to bottom

[fixed] allow a StaticLocation to be passed directly when creating a router #836

Merged
merged 1 commit into from
Feb 14, 2015
Merged

[fixed] allow a StaticLocation to be passed directly when creating a router #836

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: 4 additions & 3 deletions modules/createRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,15 @@ function createRouter(options) {
var pendingTransition = null;
var dispatchHandler = null;

if (typeof location === 'string') {
if (typeof location === 'string')
location = new StaticLocation(location);

if (location instanceof StaticLocation) {
warning(
!canUseDOM || process.env.NODE_ENV === 'test',
'You should not use a static location in a DOM environment because ' +
'the router will not be kept in sync with the current URL'
);

location = new StaticLocation(location);
} else {
invariant(
canUseDOM || location.needsDOM === false,
Expand Down