feat(router): Support unsubscription from Location by returning the subscription.

alxhub · alxhub · commit 2674eaca517e · 2015-10-26T21:35:18.000Z
diff --git a/modules/angular2/src/mock/location_mock.ts b/modules/angular2/src/mock/location_mock.ts
@@ -44,8 +44,8 @@ export class SpyLocation implements Location {
   }
 
   subscribe(onNext: (value: any) => void, onThrow: (error: any) => void = null,
-            onReturn: () => void = null) {
-    ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
+            onReturn: () => void = null): Object {
+    return ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
   }
 
   // TODO: remove these once Location is an interface, and can be implemented cleanly
diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts
@@ -144,8 +144,8 @@ export class Location {
    * Subscribe to the platform's `popState` events.
    */
   subscribe(onNext: (value: any) => void, onThrow: (exception: any) => void = null,
-            onReturn: () => void = null): void {
-    ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
+            onReturn: () => void = null): Object {
+    return ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ export class SpyLocation implements Location {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`subscribe(onNext: (value: any) => void, onThrow: (error: any) => void = null,`
`47`		`- onReturn: () => void = null) {`
`48`		`- ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);`
	`47`	`+ onReturn: () => void = null): Object {`
	`48`	`+ return ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// TODO: remove these once Location is an interface, and can be implemented cleanly`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ export class Location {`
`144`	`144`	* Subscribe to the platform's `popState` events.
`145`	`145`	`*/`
`146`	`146`	`subscribe(onNext: (value: any) => void, onThrow: (exception: any) => void = null,`
`147`		`- onReturn: () => void = null): void {`
`148`		`- ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);`
	`147`	`+ onReturn: () => void = null): Object {`
	`148`	`+ return ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`