Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from Microsoft/master

Browse Source 
Merge 1
This commit is contained in:
Zev Spitz
2015-03-31 10:03:20 +03:00
parent 5330db66cd e13dc1d354
commit 3a443a2965
12 changed files with 5 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/commandLineParser.ts
-8
View File
@@ -9,10 +9,6 @@ module ts {
name: "charset",
type: "string",
},
{
name: "codepage",
type: "number",
},
{
name: "declaration",
shortName: "d",
@@ -78,10 +74,6 @@ module ts {
name: "noLib",
type: "boolean",
},
{
name: "noLibCheck",
type: "boolean",
},
{
name: "noResolve",
type: "boolean",
src/compiler/types.ts
-2
View File
@@ -1560,7 +1560,6 @@ module ts {
export interface CompilerOptions {
allowNonTsExtensions?: boolean;
charset?: string;
codepage?: number;
declaration?: boolean;
diagnostics?: boolean;
emitBOM?: boolean;
@@ -1574,7 +1573,6 @@ module ts {
noErrorTruncation?: boolean;
noImplicitAny?: boolean;
noLib?: boolean;
noLibCheck?: boolean;
noResolve?: boolean;
out?: string;
outDir?: string;
src/harness/harness.ts
-10
View File
@@ -1036,17 +1036,7 @@ module Harness {
useCaseSensitiveFileNames = setting.value === 'true';
break;
case 'mapsourcefiles':
case 'maproot':
case 'generatedeclarationfiles':
case 'gatherDiagnostics':
case 'codepage':
case 'createFileLog':
case 'filename':
case 'removecomments':
case 'watch':
case 'allowautomaticsemicoloninsertion':
case 'locale':
// Not supported yet
break;
src/lib/scriptHost.d.ts
Vendored
+5 -1
View File
@@ -4,7 +4,11 @@
/// Windows Script Host APIS
/////////////////////////////
declare var ActiveXObject: { new (s: string): any; };
interface ActiveXObject {
new (s: string): any;
}
declare var ActiveXObject: ActiveXObject;
interface ITextWriter {
Write(s: string): void;
tests/baselines/reference/APISample_compile.js
-2
View File
@@ -1216,7 +1216,6 @@ declare module "typescript" {
interface CompilerOptions {
allowNonTsExtensions?: boolean;
charset?: string;
codepage?: number;
declaration?: boolean;
diagnostics?: boolean;
emitBOM?: boolean;
@@ -1230,7 +1229,6 @@ declare module "typescript" {
noErrorTruncation?: boolean;
noImplicitAny?: boolean;
noLib?: boolean;
noLibCheck?: boolean;
noResolve?: boolean;
out?: string;
outDir?: string;
tests/baselines/reference/APISample_compile.types
-6
View File
@@ -3901,9 +3901,6 @@ declare module "typescript" {
charset?: string;␍
>charset : string
codepage?: number;␍
>codepage : number
declaration?: boolean;␍
>declaration : boolean
@@ -3944,9 +3941,6 @@ declare module "typescript" {
noLib?: boolean;␍
>noLib : boolean
noLibCheck?: boolean;␍
>noLibCheck : boolean
noResolve?: boolean;␍
>noResolve : boolean
tests/baselines/reference/APISample_linter.js
-2
View File
@@ -1247,7 +1247,6 @@ declare module "typescript" {
interface CompilerOptions {
allowNonTsExtensions?: boolean;
charset?: string;
codepage?: number;
declaration?: boolean;
diagnostics?: boolean;
emitBOM?: boolean;
@@ -1261,7 +1260,6 @@ declare module "typescript" {
noErrorTruncation?: boolean;
noImplicitAny?: boolean;
noLib?: boolean;
noLibCheck?: boolean;
noResolve?: boolean;
out?: string;
outDir?: string;
tests/baselines/reference/APISample_linter.types
-6
View File
@@ -4047,9 +4047,6 @@ declare module "typescript" {
charset?: string;␍
>charset : string
codepage?: number;␍
>codepage : number
declaration?: boolean;␍
>declaration : boolean
@@ -4090,9 +4087,6 @@ declare module "typescript" {
noLib?: boolean;␍
>noLib : boolean
noLibCheck?: boolean;␍
>noLibCheck : boolean
noResolve?: boolean;␍
>noResolve : boolean
tests/baselines/reference/APISample_transform.js
-2
View File
@@ -1248,7 +1248,6 @@ declare module "typescript" {
interface CompilerOptions {
allowNonTsExtensions?: boolean;
charset?: string;
codepage?: number;
declaration?: boolean;
diagnostics?: boolean;
emitBOM?: boolean;
@@ -1262,7 +1261,6 @@ declare module "typescript" {
noErrorTruncation?: boolean;
noImplicitAny?: boolean;
noLib?: boolean;
noLibCheck?: boolean;
noResolve?: boolean;
out?: string;
outDir?: string;
tests/baselines/reference/APISample_transform.types
-6
View File
@@ -3997,9 +3997,6 @@ declare module "typescript" {
charset?: string;
>charset : string
codepage?: number;
>codepage : number
declaration?: boolean;
>declaration : boolean
@@ -4040,9 +4037,6 @@ declare module "typescript" {
noLib?: boolean;
>noLib : boolean
noLibCheck?: boolean;
>noLibCheck : boolean
noResolve?: boolean;
>noResolve : boolean
tests/baselines/reference/APISample_watcher.js
-2
View File
@@ -1285,7 +1285,6 @@ declare module "typescript" {
interface CompilerOptions {
allowNonTsExtensions?: boolean;
charset?: string;
codepage?: number;
declaration?: boolean;
diagnostics?: boolean;
emitBOM?: boolean;
@@ -1299,7 +1298,6 @@ declare module "typescript" {
noErrorTruncation?: boolean;
noImplicitAny?: boolean;
noLib?: boolean;
noLibCheck?: boolean;
noResolve?: boolean;
out?: string;
outDir?: string;
tests/baselines/reference/APISample_watcher.types
-6
View File
@@ -4170,9 +4170,6 @@ declare module "typescript" {
charset?: string;
>charset : string
codepage?: number;
>codepage : number
declaration?: boolean;
>declaration : boolean
@@ -4213,9 +4210,6 @@ declare module "typescript" {
noLib?: boolean;
>noLib : boolean
noLibCheck?: boolean;
>noLibCheck : boolean
noResolve?: boolean;
>noResolve : boolean