b2a940f feat(router): listen to location changes

vsavkin · vsavkin · commit 039a2f0ac006 · 2016-04-30T19:12:31.000Z
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Sat Apr 30 18:27:22 UTC 2016
-76d6f5fa0d3cd6b376c2327e5073442e2b8c5a8d
+Sat Apr 30 19:12:31 UTC 2016
+b2a940f0613d4b84706c58e1b51f1251b118bd32
diff --git a/lib/src/alt_router/router.dart b/lib/src/alt_router/router.dart
@@ -7,7 +7,7 @@ import "directives/router_outlet.dart" show RouterOutlet;
 import "package:angular2/src/facade/lang.dart" show Type, isBlank, isPresent;
 import "package:angular2/src/facade/collection.dart" show ListWrapper;
 import "package:angular2/src/facade/async.dart"
-    show EventEmitter, Stream, PromiseWrapper;
+    show EventEmitter, Stream, PromiseWrapper, ObservableWrapper;
 import "package:angular2/src/facade/collection.dart" show StringMapWrapper;
 import "package:angular2/src/facade/exceptions.dart" show BaseException;
 import "router_url_serializer.dart" show RouterUrlSerializer;
@@ -45,9 +45,11 @@ class Router {
   Location _location;
   Tree<RouteSegment> _prevTree;
   Tree<UrlSegment> _urlTree;
+  dynamic _locationSubscription;
   EventEmitter _changes = new EventEmitter();
   Router(this._rootComponent, this._rootComponentType, this._componentResolver,
       this._urlSerializer, this._routerOutletMap, this._location) {
+    this._setUpLocationChangeListener();
     this.navigateByUrl(this._location.path());
   }
   Tree<UrlSegment> get urlTree {
@@ -62,6 +64,16 @@ class Router {
     return this._navigate(this.createUrlTree(changes, segment));
   }
 
+  void dispose() {
+    ObservableWrapper.dispose(this._locationSubscription);
+  }
+
+  void _setUpLocationChangeListener() {
+    this._locationSubscription = this._location.subscribe((change) {
+      this._navigate(this._urlSerializer.parse(change["url"]));
+    });
+  }
+
   Future _navigate(Tree<UrlSegment> url) {
     this._urlTree = url;
     return recognize(this._componentResolver, this._rootComponentType, url)
diff --git a/lib/src/alt_router/router_providers_common.dart b/lib/src/alt_router/router_providers_common.dart
@@ -38,6 +38,8 @@ Router routerFactory(
         "Bootstrap at least one component before injecting Router.");
   }
   // TODO: vsavkin this should not be null
-  return new Router(null, app.componentTypes[0], componentResolver,
+  var router = new Router(null, app.componentTypes[0], componentResolver,
       urlSerializer, routerOutletMap, location);
+  app.registerDisposeListener(() => router.dispose());
+  return router;
 }
diff --git a/test/alt_router/integration_spec.dart b/test/alt_router/integration_spec.dart
@@ -66,6 +66,18 @@ main() {
           advance(fixture);
           expect(location.path()).toEqual("/team/33/simple");
         })));
+    it(
+        "should navigate when locations changes",
+        fakeAsync(inject([Router, TestComponentBuilder, Location],
+            (router, tcb, location) {
+          var fixture = tcb.createFakeAsync(RootCmp);
+          router.navigateByUrl("/team/22/user/victor");
+          advance(fixture);
+          location.simulateHashChange("/team/22/user/fedor");
+          advance(fixture);
+          expect(fixture.debugElement.nativeElement)
+              .toHaveText("team 22 { hello fedor, aux:  }");
+        })));
     it(
         "should support nested routes",
         fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ Router routerFactory(`
`38`	`38`	`"Bootstrap at least one component before injecting Router.");`
`39`	`39`	`}`
`40`	`40`	`// TODO: vsavkin this should not be null`
`41`		`- return new Router(null, app.componentTypes[0], componentResolver,`
	`41`	`+ var router = new Router(null, app.componentTypes[0], componentResolver,`
`42`	`42`	`urlSerializer, routerOutletMap, location);`
	`43`	`+ app.registerDisposeListener(() => router.dispose());`
	`44`	`+ return router;`
`43`	`45`	`}`