From 3538acc5cef089c7151f1f0be838be6d89399da3 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Fri, 8 Apr 2016 16:11:22 +0300 Subject: [PATCH] Support for zone 0.6 callback wrapping --- globals/globals.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/globals/globals.ts b/globals/globals.ts index 4fea68af0..e703ddc24 100644 --- a/globals/globals.ts +++ b/globals/globals.ts @@ -29,9 +29,14 @@ global.loadModule = function(name: string): any { } } -global.zonedCallback = function(callback: Function): Function { +global.zonedCallback = function (callback: Function): Function { if (global.zone) { + // Zone v0.5.* style callback wrapping return global.zone.bind(callback); + } + if (global.Zone) { + // Zone v0.6.* style callback wrapping + return global.Zone.current.wrap(callback); } else { return callback; }