From f975bdf7a42f64f39fc26b22dc26c92fcae00dd5 Mon Sep 17 00:00:00 2001 From: Jonny Buchanan Date: Sat, 14 Feb 2015 01:13:46 +0000 Subject: [PATCH] [fixed] allow a StaticLocation to be passed directly when creating a router --- modules/createRouter.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/createRouter.js b/modules/createRouter.js index 7034d3cbf7..2091631c15 100644 --- a/modules/createRouter.js +++ b/modules/createRouter.js @@ -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,