fix: dont automagically dequeue on setInterval

btford · btford · commit da99e15a91b0 · 2014-05-07T05:48:11.000-07:00
diff --git a/test/counting-zone.spec.js b/test/counting-zone.spec.js
@@ -53,6 +53,39 @@ describe('Zone.countingZone', function () {
     });
   });
 
+  it('should work with setInterval', function () {
+    var latch = 0, id;
+
+    runs(function () {
+      countingZone.run(function () {
+        id = setInterval(function () {
+          latch += 1;
+        }, 0);
+        expect(countingZone.counter()).toBe(1);
+      });
+    });
+
+    waitsFor(function () {
+      return latch === 2;
+    }, 100, 'latch to increment');
+
+    runs(function () {
+      expect(countingZone.counter()).toBe(1);
+      clearInterval(id);
+    });
+  });
+
+  it('should work with clearInterval', function () {
+    var id;
+    countingZone.run(function () {
+      id = setInterval(function () {
+        latch += 1;
+      }, 0);
+      expect(countingZone.counter()).toBe(1);
+      clearInterval(id);
+      expect(countingZone.counter()).toBe(0);
+    });
+  });
 
   it('should work with addEventListener', function () {
     var elt = document.createElement('button');
diff --git a/zone.js b/zone.js
@@ -117,17 +117,32 @@ Zone.patchSetClearFn = function (obj, fnNames) {
     if (delegate) {
       var ids = {};
 
-      zone[setName] = function (fn) {
-        var id;
-        arguments[0] = function () {
-          delete ids[id];
-          return fn.apply(this, arguments);
+      if (setName === 'setInterval') {
+        zone[setName] = function (fn) {
+          var id;
+          arguments[0] = function () {
+            delete ids[id];
+            return fn.apply(this, arguments);
+          };
+          var args = Zone.bindArguments(arguments);
+          id = delegate.apply(obj, args);
+          ids[id] = true;
+          return id;
         };
-        var args = Zone.bindArgumentsOnce(arguments);
-        id = delegate.apply(obj, args);
-        ids[id] = true;
-        return id;
-      };
+      } else {
+        zone[setName] = function (fn) {
+          var id;
+          arguments[0] = function () {
+            delete ids[id];
+            return fn.apply(this, arguments);
+          };
+          var args = Zone.bindArgumentsOnce(arguments);
+          id = delegate.apply(obj, args);
+          ids[id] = true;
+          return id;
+        };
+      }
+
 
       obj[setName] = function () {
         return zone[setName].apply(this, arguments);
