Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+3 -3
View File
@@ -1735,7 +1735,7 @@ declare module "react/addons" {
totalTime: number;
}
module ReactPerf {
namespace ReactPerf {
export function start(): void;
export function stop(): void;
export function printInclusive(measurements: Measurements[]): void;
@@ -1753,7 +1753,7 @@ declare module "react/addons" {
new(): any;
}
module ReactTestUtils {
namespace ReactTestUtils {
export import Simulate = ReactSimulate;
export function renderIntoDocument<P>(
@@ -1847,7 +1847,7 @@ declare module "react/addons" {
(component: Component<any, any>, eventData?: SyntheticEventData): void;
}
module ReactSimulate {
namespace ReactSimulate {
export var blur: EventSimulator;
export var change: EventSimulator;
export var click: EventSimulator;
+3 -3
View File
@@ -128,7 +128,7 @@ declare namespace __React {
totalTime: number;
}
module ReactPerf {
namespace ReactPerf {
export function start(): void;
export function stop(): void;
export function printInclusive(measurements: Measurements[]): void;
@@ -146,7 +146,7 @@ declare namespace __React {
new(): any;
}
module ReactTestUtils {
namespace ReactTestUtils {
export import Simulate = ReactSimulate;
export function renderIntoDocument<P>(
@@ -240,7 +240,7 @@ declare namespace __React {
(component: Component<any, any>, eventData?: SyntheticEventData): void;
}
module ReactSimulate {
namespace ReactSimulate {
export var blur: EventSimulator;
export var change: EventSimulator;
export var click: EventSimulator;