Merge remote-tracking branch 'main/master'

This commit is contained in:
kyo-ago
2013-10-03 22:03:00 +09:00
7 changed files with 141 additions and 108 deletions

View File

@@ -679,6 +679,7 @@ declare module ng {
scope?: any;
link?: Function;
compile?: Function;
controller?: Function;
}
///////////////////////////////////////////////////////////////////////////

138
chai/chai-assert.d.ts vendored
View File

@@ -7,108 +7,108 @@ declare module chai
{
interface Assert
{
(express:any, msg?:string);
(express:any, msg?:string):void;
fail(actual?:any, expected?:any, msg?:string, operator?:string);
fail(actual?:any, expected?:any, msg?:string, operator?:string):void;
ok(val:any, msg?:string);
notOk(val:any, msg?:string);
ok(val:any, msg?:string):void;
notOk(val:any, msg?:string):void;
equal(act:any, exp:any, msg?:string);
notEqual(act:any, exp:any, msg?:string);
equal(act:any, exp:any, msg?:string):void;
notEqual(act:any, exp:any, msg?:string):void;
strictEqual(act:any, exp:any, msg?:string);
notStrictEqual(act:any, exp:any, msg?:string);
strictEqual(act:any, exp:any, msg?:string):void;
notStrictEqual(act:any, exp:any, msg?:string):void;
deepEqual(act:any, exp:any, msg?:string);
notDeepEqual(act:any, exp:any, msg?:string);
deepEqual(act:any, exp:any, msg?:string):void;
notDeepEqual(act:any, exp:any, msg?:string):void;
isTrue(val:any, msg?:string);
isFalse(val:any, msg?:string);
isTrue(val:any, msg?:string):void;
isFalse(val:any, msg?:string):void;
isNull(val:any, msg?:string);
isNotNull(val:any, msg?:string);
isNull(val:any, msg?:string):void;
isNotNull(val:any, msg?:string):void;
isUndefined(val:any, msg?:string);
isDefined(val:any, msg?:string);
isUndefined(val:any, msg?:string):void;
isDefined(val:any, msg?:string):void;
isFunction(val:any, msg?:string);
isNotFunction(val:any, msg?:string);
isFunction(val:any, msg?:string):void;
isNotFunction(val:any, msg?:string):void;
isObject(val:any, msg?:string);
isNotObject(val:any, msg?:string);
isObject(val:any, msg?:string):void;
isNotObject(val:any, msg?:string):void;
isArray(val:any, msg?:string);
isNotArray(val:any, msg?:string);
isArray(val:any, msg?:string):void;
isNotArray(val:any, msg?:string):void;
isString(val:any, msg?:string);
isNotString(val:any, msg?:string);
isString(val:any, msg?:string):void;
isNotString(val:any, msg?:string):void;
isNumber(val:any, msg?:string);
isNotNumber(val:any, msg?:string);
isNumber(val:any, msg?:string):void;
isNotNumber(val:any, msg?:string):void;
isBoolean(val:any, msg?:string);
isNotBoolean(val:any, msg?:string);
isBoolean(val:any, msg?:string):void;
isNotBoolean(val:any, msg?:string):void;
typeOf(val:any, type:string, msg?:string);
notTypeOf(val:any, type:string, msg?:string);
typeOf(val:any, type:string, msg?:string):void;
notTypeOf(val:any, type:string, msg?:string):void;
instanceOf(val:any, type:Function, msg?:string);
notInstanceOf(val:any, type:Function, msg?:string);
instanceOf(val:any, type:Function, msg?:string):void;
notInstanceOf(val:any, type:Function, msg?:string):void;
include(exp:string, inc:any, msg?:string);
include(exp:any[], inc:any, msg?:string);
include(exp:string, inc:any, msg?:string):void;
include(exp:any[], inc:any, msg?:string):void;
notInclude(exp:string, inc:any, msg?:string);
notInclude(exp:any[], inc:any, msg?:string);
notInclude(exp:string, inc:any, msg?:string):void;
notInclude(exp:any[], inc:any, msg?:string):void;
match(exp:any, re:RegExp, msg?:string);
notMatch(exp:any, re:RegExp, msg?:string);
match(exp:any, re:RegExp, msg?:string):void;
notMatch(exp:any, re:RegExp, msg?:string):void;
property(obj:Object, prop:string, msg?:string);
notProperty(obj:Object, prop:string, msg?:string);
deepProperty(obj:Object, prop:string, msg?:string);
notDeepProperty(obj:Object, prop:string, msg?:string);
property(obj:Object, prop:string, msg?:string):void;
notProperty(obj:Object, prop:string, msg?:string):void;
deepProperty(obj:Object, prop:string, msg?:string):void;
notDeepProperty(obj:Object, prop:string, msg?:string):void;
propertyVal(obj:Object, prop:string, val:any, msg?:string);
propertyNotVal(obj:Object, prop:string, val:any, msg?:string);
propertyVal(obj:Object, prop:string, val:any, msg?:string):void;
propertyNotVal(obj:Object, prop:string, val:any, msg?:string):void;
deepPropertyVal(obj:Object, prop:string, val:any, msg?:string);
deepPropertyNotVal(obj:Object, prop:string, val:any, msg?:string);
deepPropertyVal(obj:Object, prop:string, val:any, msg?:string):void;
deepPropertyNotVal(obj:Object, prop:string, val:any, msg?:string):void;
lengthOf(exp:any, len:number, msg?:string);
lengthOf(exp:any, len:number, msg?:string):void;
//alias frenzy
throw(fn:Function, msg?:string);
throw(fn:Function, regExp:RegExp);
throw(fn:Function, errType:Function, msg?:string);
throw(fn:Function, errType:Function, regExp:RegExp);
throw(fn:Function, msg?:string):void;
throw(fn:Function, regExp:RegExp):void;
throw(fn:Function, errType:Function, msg?:string):void;
throw(fn:Function, errType:Function, regExp:RegExp):void;
throws(fn:Function, msg?:string);
throws(fn:Function, regExp:RegExp);
throws(fn:Function, errType:Function, msg?:string);
throws(fn:Function, errType:Function, regExp:RegExp);
throws(fn:Function, msg?:string):void;
throws(fn:Function, regExp:RegExp):void;
throws(fn:Function, errType:Function, msg?:string):void;
throws(fn:Function, errType:Function, regExp:RegExp):void;
Throw(fn:Function, msg?:string);
Throw(fn:Function, regExp:RegExp);
Throw(fn:Function, errType:Function, msg?:string);
Throw(fn:Function, errType:Function, regExp:RegExp);
Throw(fn:Function, msg?:string):void;
Throw(fn:Function, regExp:RegExp):void;
Throw(fn:Function, errType:Function, msg?:string):void;
Throw(fn:Function, errType:Function, regExp:RegExp):void;
doesNotThrow(fn:Function, msg?:string);
doesNotThrow(fn:Function, regExp:RegExp);
doesNotThrow(fn:Function, errType:Function, msg?:string);
doesNotThrow(fn:Function, errType:Function, regExp:RegExp);
doesNotThrow(fn:Function, msg?:string):void;
doesNotThrow(fn:Function, regExp:RegExp):void;
doesNotThrow(fn:Function, errType:Function, msg?:string):void;
doesNotThrow(fn:Function, errType:Function, regExp:RegExp):void;
operator(val:any, operator:string, val2:any, msg?:string);
closeTo(act:number, exp:number, delta:number, msg?:string);
operator(val:any, operator:string, val2:any, msg?:string):void;
closeTo(act:number, exp:number, delta:number, msg?:string):void;
sameMembers(set1:any[], set2:any[], msg?:string);
includeMembers(set1:any[], set2:any[], msg?:string);
sameMembers(set1:any[], set2:any[], msg?:string):void;
includeMembers(set1:any[], set2:any[], msg?:string):void;
ifError(val:any, msg?:string);
ifError(val:any, msg?:string):void;
}
//node module
var assert:Assert;
}
//browser global
declare var assert:chai.Assert;
declare var assert:chai.Assert;

39
d3/d3.d.ts vendored
View File

@@ -312,7 +312,7 @@ declare module D3 {
};
/**
* Request an XML document fragment.
*
*
* @param url Url to request
* @param callback Function to invoke when resource is loaded or the request fails
*/
@@ -563,7 +563,7 @@ declare module D3 {
(): string;
/**
* Set the MIME Type for the request
*
*
* @param type The MIME type for the request
*/
(type: string): Xhr;
@@ -578,7 +578,7 @@ declare module D3 {
(): (xhr: XMLHttpRequest) => any;
/**
* Set function used to map the response to the associated data value
*
*
* @param value The function used to map the response to a data value
*/
(value: (xhr: XMLHttpRequest) => any): Xhr;
@@ -643,7 +643,7 @@ declare module D3 {
export interface Dsv {
/**
* Request a delimited values file
*
*
* @param url Url to request
* @param callback Function to invoke when resource is loaded or the request fails
*/
@@ -656,7 +656,7 @@ declare module D3 {
parse(string: string): any[];
/**
* Parse a delimited string into tuples, ignoring the header row.
*
*
* @param string delimited formatted string to parse
*/
parseRows(string: string, accessor: (row: any[], index: number) => any): any;
@@ -709,6 +709,7 @@ declare module D3 {
append: (name: string) => Selection;
insert: (name: string, before: string) => Selection;
remove: () => Selection;
empty: () => boolean;
data: {
(values: (data: any, index?: number) => any[], key?: (data: any, index?: number) => string): UpdateSelection;
@@ -1048,15 +1049,15 @@ declare module D3 {
(seperation: (a: GraphNode, b: GraphNode) => number): TreeLayout;
};
/**
* Gets or sets the available layout size
* Gets or sets the available layout size
*/
size: {
/**
* Gets the available layout size
* Gets the available layout size
*/
(): Array<number>;
/**
* Sets the available layout size
* Sets the available layout size
*/
(size: Array<number>): TreeLayout;
};
@@ -1335,7 +1336,7 @@ declare module D3 {
(size: Array<number>): PackLayout;
}
}
export interface TreeMapLayout {
sort: {
(): (a: GraphNode, b: GraphNode) => number;
@@ -1392,6 +1393,18 @@ declare module D3 {
}
export interface RGBColor extends Color{
/**
* the red color channel.
*/
r: number;
/**
* the greeb color channel.
*/
g: number;
/**
* the blue color channel.
*/
b: number;
/**
* convert from RGB to HSL.
*/
@@ -2011,7 +2024,7 @@ declare module D3 {
(defined: (data: any) => any): Area;
};
}
export interface AreaRadial {
/**
* Generate a piecewise linear area, as in an area chart.
@@ -2876,15 +2889,15 @@ declare module D3 {
*/
stream(object: GeoJSON, listener: any): Stream;
/**
*
*
*/
graticule(): Graticule;
/**
*
*
*/
greatArc: GreatArc;
/**
*
*
*/
rotation(rotation: Array<number>): Rotation;
}

View File

@@ -596,11 +596,12 @@ declare module createjs {
autoClear: boolean;
canvas: HTMLCanvasElement;
mouseInBounds: boolean;
mouseMoveOutside: boolean;
mouseX: number;
mouseY: number;
snapToPixelEnabled: boolean;
tickOnUpdate: boolean;
new (): Stage;
new (canvas: HTMLElement): Stage;

14
node/node.d.ts vendored
View File

@@ -749,9 +749,9 @@ declare module "fs" {
export function lchmod(path: string, mode: string, callback?: Function): void;
export function lchmodSync(path: string, mode: number): void;
export function lchmodSync(path: string, mode: string): void;
export function stat(path: string, callback?: (err: Error, stats: Stats) =>any): Stats;
export function lstat(path: string, callback?: (err: Error, stats: Stats) =>any): Stats;
export function fstat(fd: string, callback?: (err: Error, stats: Stats) =>any): Stats;
export function stat(path: string, callback?: (err: Error, stats: Stats) => any): void;
export function lstat(path: string, callback?: (err: Error, stats: Stats) => any): void;
export function fstat(fd: string, callback?: (err: Error, stats: Stats) => any): void;
export function statSync(path: string): Stats;
export function lstatSync(path: string): Stats;
export function fstatSync(fd: string): Stats;
@@ -759,9 +759,9 @@ declare module "fs" {
export function linkSync(srcpath: string, dstpath: string): void;
export function symlink(srcpath: string, dstpath: string, type?: string, callback?: Function): void;
export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
export function readlink(path: string, callback?: (err: Error, linkString: string) =>any): void;
export function readlink(path: string, callback?: (err: Error, linkString: string) => any): void;
export function readlinkSync(path: string): string;
export function realpath(path: string, callback?: (err: Error, resolvedPath: string) =>any): void;
export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => any): void;
export function realpath(path: string, cache: {[path: string]: string}, callback: (err: Error, resolvedPath: string) =>any): void;
export function realpathSync(path: string, cache?: {[path: string]: string}): void;
export function unlink(path: string, callback?: Function): void;
@@ -792,7 +792,7 @@ declare module "fs" {
export function writeSync(fd: string, buffer: NodeBuffer, offset: number, length: number, position: number): void;
export function read(fd: string, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
export function readSync(fd: string, buffer: NodeBuffer, offset: number, length: number, position: number): any[];
export function readFile(filename: string, options: { encoding?: string; flag?: string; }, callback: (err: Error, data: any) => void ): void;
export function readFile(filename: string, options: { encoding?: string; flag?: string; }, callback: (err: Error, data: any) => void): void;
export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void ): void;
export function readFileSync(filename: string): NodeBuffer;
export function readFileSync(filename: string, options: { encoding?: string; flag?: string; }): any;
@@ -810,7 +810,7 @@ declare module "fs" {
export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
export function unwatchFile(filename: string, listener?: Stats): void;
export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) =>any): FSWatcher;
export function exists(path: string, callback?: (exists: boolean) =>void ): void;
export function exists(path: string, callback?: (exists: boolean) => void): void;
export function existsSync(path: string): boolean;
export function createReadStream(path: string, options?: {
flags?: string;

20
winjs/winjs.d.ts vendored
View File

@@ -18,7 +18,7 @@ declare module WinJS {
module Binding {
function as(data: any): any;
class List {
constructor(data: any[]);
constructor(data?: any[]);
public push(item: any): any;
public indexOf(item: any): number;
public splice(start: number, howMany?: number, item?: any[]): any[];
@@ -47,6 +47,24 @@ declare module WinJS {
public notifyMutated(index: number);
}
class Template {
public element: HTMLElement;
public extractChild: boolean;
public processTimeout: number;
public debugBreakOnRender: boolean;
public disableOptimizedProcessing: boolean;
public isDeclarativeControlContainer: boolean;
public bindingInitializer: any;
constructor(element: HTMLElement, options?: any);
public render: {
(dataContext: any, container?: HTMLElement): WinJS.Promise<HTMLElement>;
value(href: string, dataContext: any, container?: HTMLElement): WinJS.Promise<HTMLElement>;
};
public renderItem(item: any, recycled?: HTMLElement);
}
}
module Namespace {
var define: any;

View File

@@ -6,31 +6,31 @@
declare class ZeroClipboard {
constructor(elements?: any, options?: ZeroClipboardOptions);
setCurrent(element: any);
setText(newText: string);
setTitle(newTitle: string);
setSize(width: number, height: number);
setHandCursor(enabled: boolean);
setCurrent(element: any): void;
setText(newText: string): void;
setTitle(newTitle: string): void;
setSize(width: number, height: number): void;
setHandCursor(enabled: boolean): void;
version: string;
moviePath: string;
trustedDomains: any;
text: string;
hoverClass: string;
activeClass: string;
resetBridge();
resetBridge(): void;
ready: boolean;
reposition();
on(eventName, func);
addEventListener(eventName: string, func);
off(eventName: string, func);
removeEventListener(eventName: string, func);
receiveEvent(eventName: string, args);
glue(elements: any);
unglue(elements: any);
static setDefaults(options: ZeroClipboardOptions);
static destroy();
reposition(): void; // returns false in some scenarios, but never returns true
on(eventName: string, func: Function): void;
addEventListener(eventName: string, func: Function): void;
off(eventName: string, func: Function): void;
removeEventListener(eventName: string, func: Function): void;
receiveEvent(eventName: string, args: any): void;
glue(elements: any): void;
unglue(elements: any): void;
static setDefaults(options: ZeroClipboardOptions): void;
static destroy(): void;
static detectFlashSupport(): boolean;
static dispatch(eventName: string, func);
static dispatch(eventName: string, args: any): void;
}
interface ZeroClipboardOptions {