fix: don't fork new zones for callbacks from the root zone

IgorMinar · vicb · commit 531d0ecc105d · 2015-05-08T12:25:18.000+02:00
BREAKING CHANGE: New child zones are now created only from a async task that installed a custom zone. Previously even without a custom zone installed (e.g. LongStacktracesZone), we would spawn new child zones for all asynchronous events. This is undesirable and generally not useful. It does not make sense for us to create new zones for callbacks from the root zone since we care only about callbacks from installed custom zones. This reduces the overhead of zones. This primarily means that LongStackTraces zone won't be able to trace events back to Zone.init(), but instead the starting point will be the installation of the LongStacktracesZone. In all practical situations this should be sufficient. Closes #92
diff --git a/dist/zone-microtask.js b/dist/zone-microtask.js
@@ -83,7 +83,7 @@ Zone.prototype = {
 
   bind: function (fn, skipEnqueue) {
     skipEnqueue || this.enqueueTask(fn);
-    var zone = this.fork();
+    var zone = this.isRootZone() ? this : this.fork();
     return function zoneBoundFn() {
       return zone.run(fn, this, arguments);
     };
diff --git a/dist/zone-microtask.min.js b/dist/zone-microtask.min.js
diff --git a/dist/zone.js b/dist/zone.js
@@ -78,7 +78,7 @@ Zone.prototype = {
 
   bind: function (fn, skipEnqueue) {
     skipEnqueue || this.enqueueTask(fn);
-    var zone = this.fork();
+    var zone = this.isRootZone() ? this : this.fork();
     return function zoneBoundFn() {
       return zone.run(fn, this, arguments);
     };
diff --git a/dist/zone.min.js b/dist/zone.min.js
diff --git a/lib/core.js b/lib/core.js
@@ -59,7 +59,7 @@ Zone.prototype = {
 
   bind: function (fn, skipEnqueue) {
     skipEnqueue || this.enqueueTask(fn);
-    var zone = this.fork();
+    var zone = this.isRootZone() ? this : this.fork();
     return function zoneBoundFn() {
       return zone.run(fn, this, arguments);
     };
diff --git a/test/zone.spec.js b/test/zone.spec.js
@@ -149,6 +149,30 @@ describe('Zone', function () {
   });
 
 
+  describe('bind', function() {
+
+    it('should execute all callbacks from root zone without forking zones', function(done) {
+      // using setTimeout for the test which relies on patching via bind
+      setTimeout(function() {
+        expect(zone.isRootZone()).toBe(true);
+        done();
+      });
+    });
+
+
+    it('should fork a zone for non-root zone', function(done) {
+      // using setTimeout for the test which relies on patching via bind
+      var childZone = zone.fork();
+      childZone.run(function() {
+        setTimeout(function() {
+          expect(zone.parent).toBe(childZone);
+          done();
+        });
+      });
+    });
+  });
+
+
   describe('fork', function () {
     it('should fork deep copy', function () {
       var protoZone = { too: { deep: true } },
