vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-05-29 23:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into photonui_v1.0.0

Browse Source
This commit is contained in:
Florent Poujol
2015-07-19 15:24:56 +02:00
parent 33628658d2 c8afffd16a
commit 5090cfa577
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsdom/jsdom-tests.ts
View File

@@ -47,5 +47,4 @@ jsdom.env({
}
});
var window: Window = jsdom.jsdom("<div>foobar</div>").parentWindow;
var document: Document = jsdom.jsdom("<html></html>");
var document: Document = jsdom.jsdom("<html></html>");

12
lodash/lodash-tests.ts
View File

@@ -1094,6 +1094,18 @@ result = <{ a: number; b: number; c: number; }>_.transform(<{ [index: string]: n
result = <number[]>_.values({ 'one': 1, 'two': 2, 'three': 3 });
// _.valueIn
class TestValueIn {
public a = 1;
public b = 2;
public c: number;
}
TestValueIn.prototype.c = 3;
result = <number[]>_.valuesIn<number>(new TestValueIn());
// → [1, 2, 3]
result = <number[]>_(new TestValueIn()).valuesIn<number>().value();
// → [1, 2, 3]
/**********
* Utilities *
***********/

17
lodash/lodash.d.ts vendored
View File

@@ -6308,6 +6308,23 @@ declare module _ {
values(object?: any): any[];
}
//_.valuesIn
interface LoDashStatic {
/**
* Creates an array of the own and inherited enumerable property values of object.
* @param object The object to query.
* @return Returns the array of property values.
**/
valuesIn<T>(object?: any): T[];
}
interface LoDashObjectWrapper<T> {
/**
* @see _.valuesIn
**/
valuesIn<TResult>(): LoDashObjectWrapper<TResult[]>;
}
/**********
* String *
**********/

29
react-router/react-router.d.ts vendored
View File

@@ -7,6 +7,8 @@
///<reference path='../react/react-addons.d.ts' />
declare module ReactRouter {
import React = __React;
//
// Transition
// ----------------------------------------------------------------------
@@ -276,42 +278,43 @@ declare module "react-router" {
export = ReactRouter;
}
declare module React {
declare module __React {
// for DefaultRoute
function createElement(
type: ReactRouter.DefaultRouteClass,
props: ReactRouter.DefaultRouteProp,
...children: React.ReactNode[]): ReactRouter.DefaultRoute;
...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
// for Link
function createElement(
type: ReactRouter.LinkClass,
props: ReactRouter.LinkProp,
...children: React.ReactNode[]): ReactRouter.Link;
...children: __React.ReactNode[]): ReactRouter.Link;
// for NotFoundRoute
function createElement(
type: ReactRouter.NotFoundRouteClass,
props: ReactRouter.NotFoundRouteProp,
...children: React.ReactNode[]): ReactRouter.NotFoundRoute;
...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
// for Redirect
function createElement(
type: ReactRouter.RedirectClass,
props: ReactRouter.RedirectProp,
...children: React.ReactNode[]): ReactRouter.Redirect;
...children: __React.ReactNode[]): ReactRouter.Redirect;
// for Route
function createElement(
type: ReactRouter.RouteClass,
props: ReactRouter.RouteProp,
...children: React.ReactNode[]): ReactRouter.Route;
...children: __React.ReactNode[]): ReactRouter.Route;
// for RouteHandler
function createElement(
type: ReactRouter.RouteHandlerClass,
props: ReactRouter.RouteHandlerProp,
...children: React.ReactNode[]): ReactRouter.RouteHandler;
...children: __React.ReactNode[]): ReactRouter.RouteHandler;
}
declare module "react/addons" {
@@ -319,35 +322,35 @@ declare module "react/addons" {
function createElement(
type: ReactRouter.DefaultRouteClass,
props: ReactRouter.DefaultRouteProp,
...children: React.ReactNode[]): ReactRouter.DefaultRoute;
...children: __React.ReactNode[]): ReactRouter.DefaultRoute;
// for Link
function createElement(
type: ReactRouter.LinkClass,
props: ReactRouter.LinkProp,
...children: React.ReactNode[]): ReactRouter.Link;
...children: __React.ReactNode[]): ReactRouter.Link;
// for NotFoundRoute
function createElement(
type: ReactRouter.NotFoundRouteClass,
props: ReactRouter.NotFoundRouteProp,
...children: React.ReactNode[]): ReactRouter.NotFoundRoute;
...children: __React.ReactNode[]): ReactRouter.NotFoundRoute;
// for Redirect
function createElement(
type: ReactRouter.RedirectClass,
props: ReactRouter.RedirectProp,
...children: React.ReactNode[]): ReactRouter.Redirect;
...children: __React.ReactNode[]): ReactRouter.Redirect;
// for Route
function createElement(
type: ReactRouter.RouteClass,
props: ReactRouter.RouteProp,
...children: React.ReactNode[]): ReactRouter.Route;
...children: __React.ReactNode[]): ReactRouter.Route;
// for RouteHandler
function createElement(
type: ReactRouter.RouteHandlerClass,
props: ReactRouter.RouteHandlerProp,
...children: React.ReactNode[]): ReactRouter.RouteHandler;
...children: __React.ReactNode[]): ReactRouter.RouteHandler;
}