feature(routing): make routing use ViewPort

closes dart-archive#704

Author: vicb

lib/routing/ng_view.dart

@@ -58,22 +58,22 @@ part of angular.routing;
 @NgDirective(
     selector: 'ng-view',
     publishTypes: const [RouteProvider],
+    children: NgAnnotation.TRANSCLUDE_CHILDREN,
     visibility: NgDirective.CHILDREN_VISIBILITY)
 class NgViewDirective implements NgDetachAware, RouteProvider {
   final NgRoutingHelper locationService;
   final ViewCache viewCache;
   final Injector injector;
-  final Element element;
   final Scope scope;
   RouteHandle _route;
+  final ViewPort _viewPort;
 
   View _view;
-  Scope _scope;
+  Scope _childScope;
   Route _viewRoute;
 
-  NgViewDirective(this.element, this.viewCache,
-                  Injector injector, Router router,
-                  this.scope)
+  NgViewDirective(this.viewCache, Injector injector,
+                  Router router, this.scope, this._viewPort)
       : injector = injector,
         locationService = injector.get(NgRoutingHelper)
   {
@@ -114,29 +114,33 @@ class NgViewDirective implements NgDetachAware, RouteProvider {
     }
 
     var newDirectives = viewInjector.get(DirectiveMap);
+
     viewCache.fromUrl(templateUrl, newDirectives).then((viewFactory) {
       _cleanUp();
-      _scope = scope.createChild(new PrototypeMap(scope.context));
-      _view = viewFactory(
-          viewInjector.createChild(
-              [new Module()..value(Scope, _scope)]));
-
-      _view.nodes.forEach((elm) => element.append(elm));
+      _childScope = scope.createChild(new PrototypeMap(scope.context));
+      var view = _view = viewFactory(viewInjector.createChild(
+          [new Module()..value(Scope, _childScope)]));
+      _childScope.rootScope.domWrite(() {
+        _viewPort.insert(view);
+      });
     });
   }
 
   _cleanUp() {
     if (_view == null) return;
 
-    _view.nodes.forEach((node) => node.remove());
-    _scope.destroy();
-
+    var view = _view;
+    _childScope.rootScope.domWrite(() {
+      _viewPort.remove(view);
+    });
+    _childScope.destroy();
     _view = null;
-    _scope = null;
+    _childScope = null;
   }
 
   Route get route => _viewRoute;
   String get routeName => _viewRoute.name;
+
   Map<String, String> get parameters {
     var res = <String, String>{};
     var p = _viewRoute;

lib/routing/routing.dart

@@ -112,8 +112,8 @@ typedef void RouteInitializerFn(Router router, RouteViewFactory viewFactory);
 class NgRoutingHelper {
   final Router router;
   final NgApp _ngApp;
-  List<NgViewDirective> portals = <NgViewDirective>[];
-  Map<String, _View> _templates = new Map<String, _View>();
+  final portals = <NgViewDirective>[];
+  final _templates = <String, _View>{};
 
   NgRoutingHelper(RouteInitializer initializer, Injector injector, this.router, this._ngApp) {
     // TODO: move this to constructor parameters when di issue is fixed:
@@ -153,7 +153,7 @@ class NgRoutingHelper {
 
       NgViewDirective view = portals.lastWhere((NgViewDirective v) {
         return _routePath(route) != _routePath(v._route) &&
-            _routePath(route).startsWith(_routePath(v._route));
+               _routePath(route).startsWith(_routePath(v._route));
       }, orElse: () => null);
       if (view != null && !alreadyActiveViews.contains(view)) {
         view._show(templateUrl, route, viewDef.modules);