fix(build): revert typescript upgrade which broke the build.

This reverts commit a7a9463. This reverts commit 59824e4.
angular · Apr 29, 2015 · b5032fd · b5032fd
1 parent a7a9463
commit b5032fd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/modules/angular2/globals.ts b/modules/angular2/globals.ts
@@ -19,5 +19,6 @@ 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
@@ -6,4 +6,4 @@ import {global} from 'angular2/src/facade/lang';
 export var __esModule = true;
 
 export var Math = global.Math;
-export var NaN = typeof NaN;
+export var NaN = global.NaN;
diff --git a/modules/angular2/tsd.json b/modules/angular2/tsd.json
@@ -9,7 +9,7 @@
       "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
     "hammerjs/hammerjs.d.ts": {
-      "commit": "22c44d95912a07f81c103a694330b15b92f7cb40"
+      "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
     "jasmine/jasmine.d.ts": {
       "commit": "055b3172e8eb374a75826710c4d08677872620d3"
@@ -72,6 +72,9 @@
     "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
@@ -8712,7 +8712,7 @@
     },
     "typescript": {
       "version": "1.5.0",
-      "resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta"
+      "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823"
     },
     "vinyl": {
       "version": "0.4.6",

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -108,7 +108,7 @@
     "through2": "^0.6.1",
     "ts2dart": "^0.3.0",
     "tsd": "^0.5.7",
-    "typescript": "mhegazy/TypeScript#v1.5-beta",
+    "typescript": "alexeagle/TypeScript#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823",
     "vinyl": "^0.4.6",
     "walk-sync": "^0.1.3",
     "xtend": "^4.0.0",