honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(compiler): make `view.disposable` array null if empty

This commit is contained in:
Tobias Bosch 2016-10-31 15:38:15 -07:00 committed by vsavkin
parent bda1909ede
commit f6710fefeb
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/compiler/src/view_compiler/view_builder.ts
View File

@ -573,7 +573,7 @@ function generateCreateMethod(view: CompileView): o.Statement[] {
[ [
view.lastRenderNode, view.lastRenderNode,
o.literalArr(view.nodes.map(node => node.renderNode)), o.literalArr(view.nodes.map(node => node.renderNode)),
o.literalArr(view.disposables), view.disposables.length ? o.literalArr(view.disposables) : o.NULL_EXPR,
]) ])
.toStmt(), .toStmt(),
new o.ReturnStatement(resultExpr) new o.ReturnStatement(resultExpr)

6
modules/@angular/core/src/linker/view.ts
View File

@ -120,8 +120,10 @@ export abstract class AppView<T> {
} }
var hostElement = var hostElement =
this.type === ViewType.COMPONENT ? this.declarationAppElement.nativeElement : null; this.type === ViewType.COMPONENT ? this.declarationAppElement.nativeElement : null;
for (var i = 0; i < this.disposables.length; i++) { if (this.disposables) {
this.disposables[i](); for (var i = 0; i < this.disposables.length; i++) {
this.disposables[i]();
}
} }
this.destroyInternal(); this.destroyInternal();
this.dirtyParentQueriesInternal(); this.dirtyParentQueriesInternal();

7
modules/@angular/core/src/linker/view_ref.ts
View File

@ -117,7 +117,12 @@ export class ViewRef_<C> implements EmbeddedViewRef<C>, ChangeDetectorRef {
this.markForCheck(); this.markForCheck();
} }
onDestroy(callback: Function) { this._view.disposables.push(callback); } onDestroy(callback: Function) {
if (!this._view.disposables) {
this._view.disposables = [];
}
this._view.disposables.push(callback);
}
destroy() { this._view.detachAndDestroy(); } destroy() { this._view.detachAndDestroy(); }
} }