fix(patching): call native cancel method

Fixes #278 Closes #279
angular · Mar 17, 2016 · 5783663 · 5783663
1 parent 44b5ee4
commit 5783663
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/browser/browser.ts b/lib/browser/browser.ts
@@ -66,7 +66,7 @@ function patchTimer(
     return clearNative((<TimerOptions>task.data).handleId);
   }
 
-  var setNative = patchMethod(window, setName, () => function(self: any, args: any[]) {
+  var setNative = patchMethod(window, setName, (delegate: Function) => function(self: any, args: any[]) {
     if (typeof args[0] === 'function') {
       var zone = Zone.current;
       var options:TimerOptions = {
@@ -78,13 +78,18 @@ function patchTimer(
       return zone.scheduleMacroTask(setName, args[0], options, scheduleTask, clearTask);
     } else {
       // cause an error by calling it directly.
-      return setNative.apply(window, args);
+      return delegate.apply(window, args);
     }
   });
 
-  var clearNative = patchMethod(window, cancelName, () => function(self: any, args: any[]) {
+  var clearNative = patchMethod(window, cancelName, (delegate: Function) => function(self: any, args: any[]) {
     var task: Task = args[0];
-    task.zone.cancelTask(task);
+    if (task && typeof task.type == 'string') {
+      task.zone.cancelTask(task);
+    } else {
+      // cause an error by calling it directly.
+      delegate.apply(window, args);
+    }
   });
 }
 
diff --git a/test/browser/setTimeout.spec.ts b/test/browser/setTimeout.spec.ts
@@ -40,4 +40,9 @@ describe('setTimeout', function () {
     });
   });
 
+  it('should pass invalid values through', function () {
+    clearTimeout(null);
+    clearTimeout(<any>{});
+  });
+
 });