Merge pull request #3466 from borisyankov/switch-to-1.4.0

switch to TypeScript v1.4
This commit is contained in:
Masahiro Wakame
2015-01-17 09:39:21 +09:00
9 changed files with 37 additions and 37 deletions
+1
View File
@@ -918,6 +918,7 @@ declare module protractor {
* @return {!webdriver.promise.Promise} A promise that resolves to the final
* value of the accumulator.
*/
reduce<T>(reduceFn: (acc: T, element: ElementFinder, index: number, arr: ElementFinder[]) => webdriver.promise.Promise<T>, initialValue: T): webdriver.promise.Promise<T>;
reduce<T>(reduceFn: (acc: T, element: ElementFinder, index: number, arr: ElementFinder[]) => T, initialValue: T): webdriver.promise.Promise<T>;
/**
+3 -3
View File
@@ -26,8 +26,8 @@ interface BootboxButton {
}
interface BootboxDialogOptions {
message: any; // String | Element
title?: any; // String | Element
message: string | Element
title?: string | Element
callback?: (result: boolean) => any;
show?: boolean;
onEscape?: () => any;
@@ -60,4 +60,4 @@ interface BootboxStatic {
hideAll(): void;
}
declare var bootbox: BootboxStatic;
declare var bootbox: BootboxStatic;
+5 -5
View File
@@ -18,8 +18,8 @@ declare module "bunyan" {
child(obj:Object, simple?:boolean):Logger;
reopenFileStreams():void;
level(value:any /* number | string */):void;
levels(name:any /* number | string */, value:any /* number | string */):void;
level(value: number | string):void;
levels(name: number | string, value: number | string):void;
trace(error:Error, format?:any, ...params:any[]):void;
trace(buffer:Buffer, format?:any, ...params:any[]):void;
@@ -62,9 +62,9 @@ declare module "bunyan" {
interface Stream {
type?: string;
level?: any; // number | string
level?: number | string;
path?: string;
stream?: WritableStream;
stream?: WritableStream | Stream;
closeOnExit?: boolean;
}
@@ -77,7 +77,7 @@ declare module "bunyan" {
export var ERROR:number;
export var FATAL:number;
export function resolveLevel(value:any /* number | string */):number;
export function resolveLevel(value: number | string):number;
export function createLogger(options:LoggerOptions):Logger;
+1 -1
View File
@@ -112,7 +112,7 @@ var params_obj = { a:['4','5','6'], b:{x:['7'], y:'8', z:['9','0','true','false'
params_obj_bang_coerce = { "!a":[4], a:[5,6] };//, b:{x:[7], y:8, z:[9,0,true,false,undefined,'']}, c:1 };
test( 'jQuery.param.sorted', function() {
var tests = [
var tests: any[] = [
{
obj: {z:1,b:2,ab:3,bc:4,ba:5,aa:6,a1:7,x:8},
traditional: false,
+1 -1
View File
@@ -3043,7 +3043,7 @@ function test_merge() {
var first = ['a', 'b', 'c'];
var second = ['d', 'e', 'f'];
$.merge($.merge([], first), second);
var z = $.merge([0, 1, 2], ['a', 'b', 'c']);
var z = $.merge<any>([0, 1, 2], ['a', 'b', 'c']);
}
function test_prop() {
@@ -59,7 +59,7 @@ declare module spiderMonkeyParserAPI {
params: Pattern[];
defaults: Expression[];
rest?: Identifier;
body?: any; // BlockStatement | Expression;
body?: BlockStatement | Expression;
generator: boolean;
expression: boolean;
}
@@ -74,7 +74,7 @@ declare module spiderMonkeyParserAPI {
* An empty statement, i.e., a solitary semicolon.
*/
interface EmptyStatement extends Statement {
type: string; //"EmptyStatement";
type: string; // "EmptyStatement";
}
/**
@@ -190,7 +190,7 @@ declare module spiderMonkeyParserAPI {
*/
interface ForStatement extends Statement {
type: string; // "ForStatement";
init?: any; // VariableDeclaration | Expression;
init?: VariableDeclaration | Expression;
test?: Expression;
update?: Expression;
body: Statement;
@@ -201,7 +201,7 @@ declare module spiderMonkeyParserAPI {
*/
interface ForInStatement extends Statement {
type: string; // "ForInStatement";
left: any; // VariableDeclaration | Expression;
left: VariableDeclaration | Expression;
right: Expression;
body: Statement;
each: boolean;
@@ -212,7 +212,7 @@ declare module spiderMonkeyParserAPI {
*/
interface ForOfStatement extends Statement {
type: string; // "ForOfStatement";
left: any; // VariableDeclaration | Expression;
left: VariableDeclaration | Expression;
right: Expression;
body: Statement;
}
@@ -248,7 +248,7 @@ declare module spiderMonkeyParserAPI {
params: Pattern[];
defaults: Expression[];
rest?: Identifier;
body: any; // BlockStatement | Expression;
body: BlockStatement | Expression;
generator: boolean;
expression: boolean;
}
@@ -307,7 +307,7 @@ declare module spiderMonkeyParserAPI {
*/
interface Property extends Node {
type: string; // "Property";
key: any; // Literal | Identifier;
key: Literal | Identifier;
value: Expression;
kind: string; // "init" | "get" | "set";
}
@@ -321,7 +321,7 @@ declare module spiderMonkeyParserAPI {
params: Pattern[];
defaults: Expression[];
rest?: Identifier;
body: any; // BlockStatement | Expression;
body: BlockStatement | Expression;
generator: boolean;
expression: boolean;
}
@@ -334,7 +334,7 @@ declare module spiderMonkeyParserAPI {
params: Pattern[];
defaults: Expression[];
rest?: Identifier;
body: any; // BlockStatement | Expression;
body: BlockStatement | Expression;
generator: boolean;
expression: boolean;
}
@@ -433,7 +433,7 @@ declare module spiderMonkeyParserAPI {
interface MemberExpression extends Expression {
type: string; // "MemberExpression";
object: Expression;
property: any; // Identifier | Expression;
property: Identifier | Expression;
computed: boolean;
}
@@ -510,7 +510,7 @@ declare module spiderMonkeyParserAPI {
*/
interface ObjectPattern extends Pattern {
type: string; // "ObjectPattern";
properties: {key: any /* Literal | Identifier */; value: Pattern;}[]; // [ { key: Literal | Identifier, value: Pattern } ];
properties: {key: Literal | Identifier; value: Pattern;}[]; // [ { key: Literal | Identifier, value: Pattern } ];
}
/**
@@ -565,8 +565,7 @@ declare module spiderMonkeyParserAPI {
*/
interface Literal extends Node, Expression {
type: string; // "Literal";
// TODO union types
value: any; // string | boolean | null | number | RegExp;
value?: string | boolean | number | RegExp;
}
/**
+1 -1
View File
@@ -21,7 +21,7 @@ declare module "nexpect" {
wait(expectation:RegExp):IChain;
sendline(line:string):IChain;
sendEof():IChain;
run(callback:(err:Error, output:string[], exit:any /* string | number */)=>void):child_process.ChildProcess;
run(callback:(err:Error, output:string[], exit: string | number)=>void):child_process.ChildProcess;
}
interface ISpawnOptions {
+12 -12
View File
@@ -8,9 +8,9 @@
"resolved": "https://registry.npmjs.org/definition-tester/-/definition-tester-0.2.0.tgz",
"dependencies": {
"bluebird": {
"version": "2.5.3",
"version": "2.7.1",
"from": "bluebird@^2.5.3",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.5.3.tgz"
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.7.1.tgz"
},
"definition-header": {
"version": "0.1.0",
@@ -23,9 +23,9 @@
"resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz",
"dependencies": {
"hoek": {
"version": "2.10.0",
"version": "2.11.0",
"from": "hoek@^2.2.x",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.10.0.tgz"
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz"
},
"topo": {
"version": "1.0.2",
@@ -38,9 +38,9 @@
"resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz"
},
"moment": {
"version": "2.8.4",
"version": "2.9.0",
"from": "moment@2.x.x",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.8.4.tgz"
"resolved": "https://registry.npmjs.org/moment/-/moment-2.9.0.tgz"
}
}
},
@@ -86,9 +86,9 @@
"resolved": "https://registry.npmjs.org/git-wrapper/-/git-wrapper-0.1.1.tgz"
},
"glob": {
"version": "4.3.2",
"version": "4.3.5",
"from": "glob@^4.3.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
"dependencies": {
"inflight": {
"version": "1.0.4",
@@ -204,7 +204,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@@ -243,9 +243,9 @@
}
},
"typescript": {
"version": "1.3.0",
"from": "typescript@1.3.0",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-1.3.0.tgz"
"version": "1.4.1",
"from": "typescript@1.4.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz"
}
}
}
+1 -1
View File
@@ -37,6 +37,6 @@
},
"devDependencies": {
"definition-tester": "0.2.0",
"typescript": "1.3.0"
"typescript": "1.4.1"
}
}