From e498a6d2f881a4eb7a52d3ca76fc1d4148e9d470 Mon Sep 17 00:00:00 2001
From: Walker Burgin <wburgin@palantir.com>
Date: Mon, 7 Sep 2015 02:07:02 -0700
Subject: [PATCH] Undo an unrelated commit

---
 react-router/react-router.d.ts | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index b58b2f7cb..f43f56484 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -67,8 +67,14 @@ declare module ReactRouter {
     interface RedirectClass extends React.ComponentClass<RedirectProp> {}
 
     // Route
-    interface Route extends React.ReactElement<any> {}
-    interface RouteClass extends React.ComponentClass<any> {}
+    interface RouteProp {
+        name?: string;
+        path?: string;
+        handler?: React.ComponentClass<any>;
+        ignoreScrollBehavior?: boolean;
+    }
+    interface Route extends React.ReactElement<RouteProp> {}
+    interface RouteClass extends React.ComponentClass<RouteProp> {}
 
     var DefaultRoute: DefaultRouteClass;
     var NotFoundRoute: NotFoundRouteClass;
@@ -168,8 +174,7 @@ declare module ReactRouter {
 
     function create(options: RouterCreateOption): Router;
     function run(routes: Route, callback: RouterRunCallback): Router;
-    function run(routes: Route, location: LocationBase, callback: RouterRunCallback): Router;
-    function run(routes: Route, location: string, callback: RouterRunCallback): Router;
+    function run(routes: Route, location: LocationBase | string, callback: RouterRunCallback): Router;
 
 
     //
@@ -193,9 +198,7 @@ declare module ReactRouter {
     interface HashLocation extends Location, LocationListener { }
     interface HistoryLocation extends Location, LocationListener { }
     interface RefreshLocation extends Location { }
-    interface StaticLocation extends LocationBase {
-        new(path: string): StaticLocation
-    }
+    interface StaticLocation extends LocationBase { }
     interface TestLocation extends Location, LocationListener { }
 
     var HashLocation: HashLocation;
@@ -304,7 +307,7 @@ declare module __React {
   // for Route
   function createElement(
     type: ReactRouter.RouteClass,
-    props: any,
+    props: ReactRouter.RouteProp,
     ...children: __React.ReactNode[]): ReactRouter.Route;
 
   // for RouteHandler
@@ -342,7 +345,7 @@ declare module "react/addons" {
   // for Route
   function createElement(
     type: ReactRouter.RouteClass,
-    props: any,
+    props: ReactRouter.RouteProp,
     ...children: __React.ReactNode[]): ReactRouter.Route;
 
   // for RouteHandler