aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2012-03-16 09:41:00 -0700
committerIgor Minar2012-03-16 09:41:05 -0700
commit9b1aff905b638aa274a5fc8f88662df446d374bd (patch)
tree481bc31495091a99fd187ef8e23b14e8441d7b28
parent252d4548f981e18f496877f0f1a30a6c05c8600f (diff)
downloadangular.js-9b1aff905b638aa274a5fc8f88662df446d374bd.tar.bz2
feat(scope): broadcast $destroy event on scope destruction
perf testing shows that in chrome this change adds 5-15% overhead when destroying 10k nested scopes where each scope has a $destroy listener
-rw-r--r--src/service/scope.js3
-rw-r--r--test/service/scopeSpec.js12
2 files changed, 14 insertions, 1 deletions
diff --git a/src/service/scope.js b/src/service/scope.js
index ef1b7b93..b7ee61d6 100644
--- a/src/service/scope.js
+++ b/src/service/scope.js
@@ -136,7 +136,6 @@ function $RootScopeProvider(){
this.$$phase = this.$parent = this.$$watchers =
this.$$nextSibling = this.$$prevSibling =
this.$$childHead = this.$$childTail = null;
- this.$destructor = noop;
this['this'] = this.$root = this;
this.$$asyncQueue = [];
this.$$listeners = {};
@@ -458,6 +457,8 @@ function $RootScopeProvider(){
if (this.$root == this) return; // we can't remove the root node;
var parent = this.$parent;
+ this.$broadcast('$destroy');
+
if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
diff --git a/test/service/scopeSpec.js b/test/service/scopeSpec.js
index 95b028fe..972584cf 100644
--- a/test/service/scopeSpec.js
+++ b/test/service/scopeSpec.js
@@ -2,6 +2,9 @@
describe('Scope', function() {
+ beforeEach(module(provideLog));
+
+
describe('$root', function() {
it('should point to itself', inject(function($rootScope) {
expect($rootScope.$root).toEqual($rootScope);
@@ -393,6 +396,15 @@ describe('Scope', function() {
$rootScope.$digest();
expect(log).toEqual('12');
}));
+
+
+ it('should broadcast the $destroy event', inject(function($rootScope, log) {
+ first.$on('$destroy', log.fn('first'));
+ first.$new().$on('$destroy', log.fn('first-child'));
+
+ first.$destroy();
+ expect(log).toEqual('first; first-child');
+ }));
});