cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ViewManager): dehydrate views recursively over ViewContainers

Browse Source 
Closes #1560
This commit is contained in:
Tobias Bosch
2015-04-27 14:07:41 -07:00
parent 6fcd3709cf
commit a801da6f7c
3 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/angular2/src/core/compiler/view_manager.js vendored
View File

@ -70,8 +70,8 @@ export class AppViewManager {
parentRenderViewRef = parentView.render;
}
var hostViewRenderRef = hostView.render;
this._utils.dehydrateAndDetachInPlaceHostView(parentView, hostView);
this._viewDehydrateRecurse(hostView);
this._utils.detachInPlaceHostView(parentView, hostView);
this._renderer.destroyInPlaceHostView(parentRenderViewRef, hostViewRenderRef);
this._destroyView(hostView);
}
@ -95,7 +95,6 @@ export class AppViewManager {
var boundElementIndex:number = viewContainerLocation.boundElementIndex;
var viewContainer = parentView.viewContainers[boundElementIndex];
var view = viewContainer.views[atIndex];
this._utils.dehydrateView(view);
this._viewDehydrateRecurse(view);
this._utils.detachViewInContainer(parentView, boundElementIndex, atIndex);
this._renderer.destroyViewInContainer(this._getRenderViewContainerRef(parentView, boundElementIndex), atIndex);
@ -167,11 +166,11 @@ export class AppViewManager {
}
_viewDehydrateRecurse(view:viewModule.AppView) {
this._utils.dehydrateView(view);
var binders = view.proto.elementBinders;
for (var i = 0; i < binders.length; i++) {
var componentView = view.componentChildViews[i];
if (isPresent(componentView)) {
this._utils.dehydrateView(componentView);
this._viewDehydrateRecurse(componentView);
if (binders[i].hasDynamicComponent()) {
this._utils.detachComponentView(view, i);
@ -182,7 +181,7 @@ export class AppViewManager {
if (isPresent(vc)) {
for (var j = vc.views.length - 1; j >= 0; j--) {
var childView = vc.views[j];
this._utils.dehydrateView(childView);
this._viewDehydrateRecurse(childView);
this._utils.detachViewInContainer(view, i, j);
this._destroyView(childView);
}
@ -193,7 +192,7 @@ export class AppViewManager {
for (var i = 0; i < view.imperativeHostViews.length; i++) {
var hostView = view.imperativeHostViews[i];
this._viewDehydrateRecurse(hostView);
this._utils.dehydrateAndDetachInPlaceHostView(view, hostView);
this._utils.detachInPlaceHostView(view, hostView);
this._destroyView(hostView);
}
view.render = null;

4
modules/angular2/src/core/compiler/view_manager_utils.js vendored
View File

@ -98,10 +98,8 @@ export class AppViewManagerUtils {
this._hydrateView(hostView, injector, hostElementInjector, new Object(), null);
}
dehydrateAndDetachInPlaceHostView(parentView:viewModule.AppView,
detachInPlaceHostView(parentView:viewModule.AppView,
hostView:viewModule.AppView) {
this.dehydrateView(hostView);
if (isPresent(parentView)) {
parentView.changeDetector.removeChild(hostView.changeDetector);
ListWrapper.remove(parentView.imperativeHostViews, hostView);