diff --git a/modules/angular2/globals.ts b/modules/angular2/globals.ts index a678ed9bbf..e0b1de5e97 100644 --- a/modules/angular2/globals.ts +++ b/modules/angular2/globals.ts @@ -19,6 +19,5 @@ interface Window { JSON: typeof JSON; Math: typeof Math; assert: typeof assert; - NaN: typeof NaN; gc(): void; } diff --git a/modules/angular2/src/facade/math.ts b/modules/angular2/src/facade/math.ts index f813fd8d85..4c15bf1e3e 100644 --- a/modules/angular2/src/facade/math.ts +++ b/modules/angular2/src/facade/math.ts @@ -6,4 +6,4 @@ import {global} from 'angular2/src/facade/lang'; export var __esModule = true; export var Math = global.Math; -export var NaN = global.NaN; +export var NaN = typeof NaN; diff --git a/modules/angular2/tsd.json b/modules/angular2/tsd.json index 3ce6280f40..86f68cf83b 100644 --- a/modules/angular2/tsd.json +++ b/modules/angular2/tsd.json @@ -72,9 +72,6 @@ "selenium-webdriver/selenium-webdriver.d.ts": { "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5" }, - "touch-events/touch-events.d.ts": { - "commit": "055b3172e8eb374a75826710c4d08677872620d3" - }, "zone/zone.d.ts": { "commit": "055b3172e8eb374a75826710c4d08677872620d3" } diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 8bcfd28c51..1d22a7e60f 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -8712,7 +8712,7 @@ }, "typescript": { "version": "1.5.0", - "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823" + "resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta" }, "vinyl": { "version": "0.4.6", diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6f748db0da..f8eb37bde0 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -13443,8 +13443,8 @@ }, "typescript": { "version": "1.5.0", - "from": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823", - "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823" + "from": "git://github.com/mhegazy/TypeScript.git#v1.5-beta", + "resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta" }, "vinyl": { "version": "0.4.6", diff --git a/package.json b/package.json index ac119d3707..0951fc1779 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "through2": "^0.6.1", "ts2dart": "^0.3.0", "tsd": "^0.5.7", - "typescript": "alexeagle/TypeScript#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823", + "typescript": "mhegazy/TypeScript#v1.5-beta", "vinyl": "^0.4.6", "walk-sync": "^0.1.3", "xtend": "^4.0.0",