Merge pull request NativeScript#1877 from NativeScript/hdeshev/zone-aware

hdeshev · hdeshev · commit bd2f2c751af5 · 2016-04-01T14:46:43.000+03:00
Zone-aware versions of certain APIs: setTimeout/setInterval mostly.
diff --git a/declarations.d.ts b/declarations.d.ts
@@ -146,6 +146,10 @@ declare function setInterval(callback: Function, milliseconds?: number): number;
  */
 declare function clearInterval(id: number): void;
 
+//@private
+declare function zonedCallback(callback: Function): Function;
+//@endprivate
+
 declare class WeakRef<T> {
     constructor(obj: T);
     get(): T;
diff --git a/globals/globals.ts b/globals/globals.ts
@@ -29,6 +29,14 @@ global.loadModule = function(name: string): any {
     }
 }
 
+global.zonedCallback = function(callback: Function): Function {
+    if (global.zone) {
+        return global.zone.bind(callback);
+    } else {
+        return callback;
+    }
+}
+
 global.registerModule("timer", () => require("timer"));
 global.registerModule("ui/dialogs", () => require("ui/dialogs"));
 global.registerModule("xhr", () => require("xhr"));
diff --git a/timer/timer.android.ts b/timer/timer.android.ts
@@ -15,11 +15,12 @@ function createHandlerAndGetId(): number {
 }
 
 export function setTimeout(callback: Function, milliseconds = 0): number {
-    var id = createHandlerAndGetId();
+    const id = createHandlerAndGetId();
+    const zoneBound = zonedCallback(callback);
 
     var runnable = new java.lang.Runnable({
         run: () => {
-            callback();
+            zoneBound();
 
             if (timeoutCallbacks[id]) {
                 delete timeoutCallbacks[id];
@@ -44,12 +45,13 @@ export function clearTimeout(id: number): void {
 }
 
 export function setInterval(callback: Function, milliseconds = 0): number {
-    var id = createHandlerAndGetId();
-    var handler = timeoutHandler;
+    const id = createHandlerAndGetId();
+    const handler = timeoutHandler;
+    const zoneBound = zonedCallback(callback);
 
     var runnable = new java.lang.Runnable({
         run: () => {
-            callback();
+            zoneBound();
             if (timeoutCallbacks[id]) {
                 handler.postDelayed(runnable, long(milliseconds));
             }
diff --git a/timer/timer.ios.ts b/timer/timer.ios.ts
@@ -40,7 +40,7 @@ function createTimerAndGetId(callback: Function, milliseconds: number, shouldRep
 }
 
 export function setTimeout(callback: Function, milliseconds = 0): number {
-    return createTimerAndGetId(callback, milliseconds, false);
+    return createTimerAndGetId(zonedCallback(callback), milliseconds, false);
 }
 
 export function clearTimeout(id: number): void {
@@ -51,7 +51,7 @@ export function clearTimeout(id: number): void {
 }
 
 export function setInterval(callback: Function, milliseconds = 0): number {
-    return createTimerAndGetId(callback, milliseconds, true);
+    return createTimerAndGetId(zonedCallback(callback), milliseconds, true);
 }
 
 export var clearInterval = clearTimeout;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,14 @@ global.loadModule = function(name: string): any {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
	`32`	`+global.zonedCallback = function(callback: Function): Function {`
	`33`	`+ if (global.zone) {`
	`34`	`+ return global.zone.bind(callback);`
	`35`	`+ } else {`
	`36`	`+ return callback;`
	`37`	`+ }`
	`38`	`+}`
	`39`	`+`
`32`	`40`	`global.registerModule("timer", () => require("timer"));`
`33`	`41`	`global.registerModule("ui/dialogs", () => require("ui/dialogs"));`
`34`	`42`	`global.registerModule("xhr", () => require("xhr"));`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function createTimerAndGetId(callback: Function, milliseconds: number, shouldRep`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`export function setTimeout(callback: Function, milliseconds = 0): number {`
`43`		`- return createTimerAndGetId(callback, milliseconds, false);`
	`43`	`+ return createTimerAndGetId(zonedCallback(callback), milliseconds, false);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`export function clearTimeout(id: number): void {`
`@@ -51,7 +51,7 @@ export function clearTimeout(id: number): void {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`export function setInterval(callback: Function, milliseconds = 0): number {`
`54`		`- return createTimerAndGetId(callback, milliseconds, true);`
	`54`	`+ return createTimerAndGetId(zonedCallback(callback), milliseconds, true);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`export var clearInterval = clearTimeout;`