feat(router): add CanDeactivate

vsavkin · vsavkin · commit deba80467141 · 2016-04-29T18:05:06.000-07:00
diff --git a/modules/angular2/src/alt_router/interfaces.ts b/modules/angular2/src/alt_router/interfaces.ts
@@ -3,4 +3,9 @@ import {RouteSegment, Tree} from './segments';
 export interface OnActivate {
   routerOnActivate(curr: RouteSegment, prev?: RouteSegment, currTree?: Tree<RouteSegment>,
                    prevTree?: Tree<RouteSegment>): void;
+}
+
+export interface CanDeactivate {
+  routerCanDeactivate(currTree?: Tree<RouteSegment>,
+                      futureTree?: Tree<RouteSegment>): Promise<boolean>;
 }
diff --git a/modules/angular2/src/alt_router/lifecycle_reflector.dart b/modules/angular2/src/alt_router/lifecycle_reflector.dart
@@ -1,5 +1,6 @@
 import './interfaces.dart';
 bool hasLifecycleHook(String name, Object obj) {
   if (name == "routerOnActivate") return obj is OnActivate;
+  if (name == "routerCanDeactivate") return obj is CanDeactivate;
   return false;
 }
diff --git a/modules/angular2/src/alt_router/lifecycle_reflector.ts b/modules/angular2/src/alt_router/lifecycle_reflector.ts
@@ -1,6 +1,7 @@
-import {Type} from 'angular2/src/facade/lang';
+import {Type, isBlank} from 'angular2/src/facade/lang';
 
 export function hasLifecycleHook(name: string, obj: Object): boolean {
+  if (isBlank(obj)) return false;
   let type = obj.constructor;
   if (!(type instanceof Type)) return false;
   return name in(<any>type).prototype;
diff --git a/modules/angular2/src/router/lifecycle/route_lifecycle_reflector.ts b/modules/angular2/src/router/lifecycle/route_lifecycle_reflector.ts
@@ -1,4 +1,4 @@
-import {Type, isPresent} from 'angular2/src/facade/lang';
+import {Type, isBlank} from 'angular2/src/facade/lang';
 import {RouteLifecycleHook, CanActivate} from './lifecycle_annotations_impl';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import './interfaces.dart';`
`2`	`2`	`bool hasLifecycleHook(String name, Object obj) {`
`3`	`3`	`if (name == "routerOnActivate") return obj is OnActivate;`
	`4`	`+ if (name == "routerCanDeactivate") return obj is CanDeactivate;`
`4`	`5`	`return false;`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {Type, isPresent} from 'angular2/src/facade/lang';`
	`1`	`+import {Type, isBlank} from 'angular2/src/facade/lang';`
`2`	`2`	`import {RouteLifecycleHook, CanActivate} from './lifecycle_annotations_impl';`
`3`	`3`	`import {reflector} from 'angular2/src/core/reflection/reflection';`
`4`	`4`