Merge pull request NativeScript#1915 from NativeScript/feature/zone-0.6

vakrilov · vakrilov · commit 24d0db70bd99 · 2016-04-08T16:36:41.000+03:00
Support for zone 0.6 callback wrapping
diff --git 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;
     }

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,14 @@ global.loadModule = function(name: string): any {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-global.zonedCallback = function(callback: Function): Function {`
	`32`	`+global.zonedCallback = function (callback: Function): Function {`
`33`	`33`	`if (global.zone) {`
	`34`	`+ // Zone v0.5.* style callback wrapping`
`34`	`35`	`return global.zone.bind(callback);`
	`36`	`+ }`
	`37`	`+ if (global.Zone) {`
	`38`	`+ // Zone v0.6.* style callback wrapping`
	`39`	`+ return global.Zone.current.wrap(callback);`
`35`	`40`	`} else {`
`36`	`41`	`return callback;`
`37`	`42`	`}`