From 6fcd3709cf2ab86bd399edf0785d1ff4d1cf86dd Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Mon, 27 Apr 2015 14:07:08 -0700
Subject: [PATCH] fix(render): return views when destroyed in ViewContainer

Closes #1316
---
 modules/angular2/src/render/dom/view/view_hydrator.js |  4 +++-
 .../test/render/dom/view/view_hydrator_spec.js        | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/angular2/src/render/dom/view/view_hydrator.js b/modules/angular2/src/render/dom/view/view_hydrator.js
index 98f7f58f98..c9beb84131 100644
--- a/modules/angular2/src/render/dom/view/view_hydrator.js
+++ b/modules/angular2/src/render/dom/view/view_hydrator.js
@@ -180,7 +180,9 @@ export class RenderViewHydrator {
 
   _viewContainerDehydrateRecurse(viewContainer) {
     for (var i=0; i<viewContainer.views.length; i++) {
-      this._viewDehydrateRecurse(viewContainer.views[i]);
+      var view = viewContainer.views[i];
+      this._viewDehydrateRecurse(view);
+      this._viewFactory.returnView(view);
     }
     viewContainer.clear();
   }
diff --git a/modules/angular2/test/render/dom/view/view_hydrator_spec.js b/modules/angular2/test/render/dom/view/view_hydrator_spec.js
index 0e8247514f..5809d73da0 100644
--- a/modules/angular2/test/render/dom/view/view_hydrator_spec.js
+++ b/modules/angular2/test/render/dom/view/view_hydrator_spec.js
@@ -223,6 +223,17 @@ export function main() {
         expect(viewFactory.spy('returnView')).toHaveBeenCalledWith(shadowView);
       });
 
+      it('should clear views in ViewContainers', () => {
+        createAndHydrate(null, null);
+        var vc = hostView.getOrCreateViewContainer(0);
+        var childView = createEmptyView();
+        vc.insert(childView);
+
+        dehydrate(hostView);
+
+        expect(viewFactory.spy('returnView')).toHaveBeenCalledWith(childView);
+      });
+
       it('should clear imperatively added child components', () => {
         var shadowView = createEmptyView();
         createAndHydrate(createProtoView(), shadowView);