Undo an unrelated commit

This commit is contained in:
Walker Burgin
2015-09-07 02:07:02 -07:00
parent cf5c5f6f9a
commit e498a6d2f8
+12 -9
View File
@@ -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