fix: proper detection of global in WebWorker

mhevery · mhevery · commit 0a7a155f419f · 2016-09-10T18:09:06.000-07:00
diff --git a/lib/browser/browser.ts b/lib/browser/browser.ts
@@ -9,7 +9,7 @@ import {patchMethod, patchPrototype, patchClass, zoneSymbol} from "../common/uti
 const set = 'set';
 const clear = 'clear';
 const blockingMethods = ['alert', 'prompt', 'confirm'];
-const _global = typeof window == 'undefined' ? global : window;
+const _global = typeof window === 'object' && window || typeof self === 'object' && self || global;
 
 patchTimer(_global, set, clear, 'Timeout');
 patchTimer(_global, set, clear, 'Interval');
diff --git a/lib/common/utils.ts b/lib/common/utils.ts
@@ -7,7 +7,7 @@
 // Hack since TypeScript isn't compiling this for a worker.
 declare const WorkerGlobalScope;
 export const zoneSymbol: (name: string) => string = Zone['__symbol__'];
-const _global = typeof window == 'undefined' ? global : window;
+const _global = typeof window === 'object' && window || typeof self === 'object' && self || global;
 
 export function bindArguments(args: any[], source: string): any[] {
   for (let i = args.length - 1; i >= 0; i--) {
diff --git a/lib/node/node.ts b/lib/node/node.ts
@@ -3,7 +3,7 @@ import {patchTimer} from '../common/timers';
 
 const set = 'set';
 const clear = 'clear';
-const _global = typeof window === 'undefined' ? global : window;
+const _global = typeof window === 'object' && window || typeof self === 'object' && self || global;
 
 // Timers
 const timers = require('timers');
diff --git a/lib/zone-spec/fake-async-test.ts b/lib/zone-spec/fake-async-test.ts
@@ -258,4 +258,4 @@
   // Export the class so that new instances can be created with proper
   // constructor params.
   Zone['FakeAsyncTestZoneSpec'] = FakeAsyncTestZoneSpec;
-})(typeof window !== 'undefined' ? window : global);
+})(typeof window === 'object' && window || typeof self === 'object' && self || global);
diff --git a/lib/zone-spec/wtf.ts b/lib/zone-spec/wtf.ts
@@ -137,4 +137,4 @@
   }
 
   Zone['wtfZoneSpec'] = !wtfEnabled ? null : new WtfZoneSpec();
-})(typeof window == 'undefined' ? global : window);
+})(typeof window === 'object' && window || typeof self === 'object' && self || global);
diff --git a/lib/zone.ts b/lib/zone.ts
@@ -1157,4 +1157,4 @@ const Zone: ZoneType = (function(global: any) {
   // This is not part of public API, but it is usefull for tests, so we expose it.
   Promise[Zone.__symbol__('uncaughtPromiseErrors')] = _uncaughtPromiseErrors;
   return global.Zone = Zone;
-})(typeof window === 'undefined' ? global : window);
+})(typeof window === 'object' && window || typeof self === 'object' && self || global);
diff --git a/test/zone_worker_entry_point.ts b/test/zone_worker_entry_point.ts
@@ -1,6 +1,4 @@
 // Setup tests for Zone without microtask support
-(self as any).global = self;
-
 System.config({
   defaultJSExtensions: true
 });

Original file line number	Diff line number	Diff line change
`@@ -137,4 +137,4 @@`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`Zone['wtfZoneSpec'] = !wtfEnabled ? null : new WtfZoneSpec();`
`140`		`-})(typeof window == 'undefined' ? global : window);`
	`140`	`+})(typeof window === 'object' && window \|\| typeof self === 'object' && self \|\| global);`