Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(Scope): ensure that a scope is destroyed only once #1631

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/ng/rootScope.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ function $RootScopeProvider(){
this.$$nextSibling = this.$$prevSibling =
this.$$childHead = this.$$childTail = null;
this['this'] = this.$root = this;
this.$$destroyed = false;
this.$$asyncQueue = [];
this.$$listeners = {};
}
Expand Down Expand Up @@ -467,10 +468,12 @@ function $RootScopeProvider(){
* perform any necessary cleanup.
*/
$destroy: function() {
if ($rootScope == this) return; // we can't remove the root node;
// we can't destroy the root scope or a scope that has been already destroyed
if ($rootScope == this || this.$$destroyed) return;
var parent = this.$parent;

this.$broadcast('$destroy');
this.$$destroyed = true;

if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
Expand Down
16 changes: 16 additions & 0 deletions test/ng/rootScopeSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,22 @@ describe('Scope', function() {
first.$destroy();
expect(log).toEqual('first; first-child');
}));


it('should $destroy a scope only once and ignore any further destroy calls',
inject(function($rootScope) {
$rootScope.$digest();
expect(log).toBe('123');

first.$destroy();
first.$apply();
expect(log).toBe('12323');

first.$destroy();
first.$destroy();
first.$apply();
expect(log).toBe('1232323');
}));
});


Expand Down