fix(Immediate): update setImmediate compatibility on IE

closes ReactiveX#1163
kwonoj · Jan 11, 2016 · 39e6c0e · 39e6c0e
1 parent 41d39e2
commit 39e6c0e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/spec/util/Immediate-spec.js b/spec/util/Immediate-spec.js
@@ -10,13 +10,25 @@ describe('ImmediateDefinition', function () {
 
   describe('when setImmediate exists on root', function () {
     it('should use the setImmediate and clearImmediate methods from root', function () {
+      var setImmediateCalled = false;
+      var clearImmediateCalled = false;
+
       var root = {
-        setImmediate: function () {},
-        clearImmediate: function () {}
+        setImmediate: function () {
+          setImmediateCalled = true;
+        },
+        clearImmediate: function () {
+          clearImmediateCalled = true;
+        }
       };
+
       var result = new ImmediateDefinition(root);
-      expect(result.setImmediate).toBe(root.setImmediate);
-      expect(result.clearImmediate).toBe(root.clearImmediate);
+
+      result.setImmediate(function () {});
+      result.clearImmediate();
+
+      expect(setImmediateCalled).toBeTruthy();
+      expect(clearImmediateCalled).toBeTruthy();
     });
   });
 

diff --git a/src/util/Immediate.ts b/src/util/Immediate.ts
@@ -20,9 +20,9 @@ export class ImmediateDefinition {
   currentlyRunningATask: boolean;
 
   constructor(private root: any) {
-    if (root.setImmediate) {
-      this.setImmediate = root.setImmediate;
-      this.clearImmediate = root.clearImmediate;
+    if (root.setImmediate && typeof root.setImmediate === 'function') {
+      this.setImmediate = root.setImmediate.bind(root);
+      this.clearImmediate = root.clearImmediate.bind(root);
     } else {
       this.nextHandle = 1;
       this.tasksByHandle = {};