refactor(ng2.uiView): make injecte parent context into a single object

fix(ng2.uiView): do not dispose ref twice. do not deregister before onInit

Author: christopherthielen

src/ng2/providers.ts

@@ -110,9 +110,7 @@ export const UIROUTER_PROVIDERS: Provider[] = [
 
   provide(UIRouterGlobals, { useFactory: (r: UIRouter) => { return r.globals; }, deps: [UIRouter]}),
 
-  provide(UiView.INJECT.context, { useFactory: (r: StateRegistry) => { return r.root(); }, deps: [StateRegistry]} ),
-
-  provide(UiView.INJECT.fqn, { useValue: null })
+  provide(UiView.PARENT_INJECT, { useFactory: (r: StateRegistry) => { return { fqn: null, context: r.root() } }, deps: [StateRegistry]} )
 
 ];
 

src/ng2/uiSref.ts

@@ -4,8 +4,7 @@ import {Directive, Inject, Input} from "angular2/core";
 import {Optional} from "angular2/core";
 import {ElementRef} from "angular2/core";
 import {Renderer} from "angular2/core";
-import {UiView} from "./uiView";
-import {ViewContext} from "../view/interface";
+import {UiView, ParentUiViewInject} from "./uiView";
 import {extend} from "../common/common";
 
 /** @hidden */
@@ -69,7 +68,7 @@ export class UiSref {
 
   constructor(
       private _router: UIRouter,
-      @Inject(UiView.INJECT.context) public context: ViewContext,
+      @Inject(UiView.PARENT_INJECT) public parent: ParentUiViewInject,
       @Optional() private _anchorUiSref: AnchorUiSref
   ) { }
 
@@ -88,7 +87,7 @@ export class UiSref {
   }
 
   getOptions() {
-    let defOpts = { relative: this.context.name, inherit: true };
+    let defOpts = { relative: this.parent && this.parent.context && this.parent.context.name, inherit: true };
     return extend(defOpts, this.options || {});
   }
 

src/ng2/uiView.ts

@@ -23,6 +23,12 @@ const getProviders = (injector) => {
   return providers;
 };
 
+// These are provide()d as the string UiView.PARENT_INJECT
+export interface ParentUiViewInject {
+  context: ViewContext;
+  fqn: string;
+}
+
 /**
  * A UI-Router viewport directive, which is filled in by a view (component) on a state.
  *
@@ -99,29 +105,25 @@ export class UiView {
   deregister: Function;
   uiViewData: any = {};
 
-  static INJECT = {
-    fqn: "UiView.parentFQN",
-    context: "UiView.parentContext"
-  };
+  static PARENT_INJECT = "UiView.PARENT_INJECT";
 
   constructor(
       public router: UIRouter,
-      @Inject(UiView.INJECT.context) public parentContext: ViewContext,
-      @Inject(UiView.INJECT.fqn) public parentFqn: string,
+      @Inject(UiView.PARENT_INJECT) public parent: ParentUiViewInject,
       public dcl: DynamicComponentLoader,
       public elementRef: ElementRef,
       public injector: Injector
   ) { }
 
   ngOnInit() {
-    let parentFqn = this.parentFqn;
+    let parentFqn = this.parent.fqn;
     let name = this.name || '$default';
 
     this.uiViewData = {
       id: id++,
       name: name,
       fqn: parentFqn ? parentFqn + "." + name : name,
-      creationContext: this.parentContext,
+      creationContext: this.parent.context,
       configUpdated: this.viewConfigUpdated.bind(this),
       config: undefined
     };
@@ -131,10 +133,11 @@ export class UiView {
 
   disposeLast() {
     if (this.componentRef) this.componentRef.dispose();
+    this.componentRef = null;
   }
 
   ngOnDestroy() {
-    this.deregister();
+    if (this.deregister) this.deregister();
     this.disposeLast();
   }
 
@@ -159,11 +162,10 @@ export class UiView {
     let rc = config.node.resolveContext;
     let resolvables = rc.getResolvables();
     let rawProviders = Object.keys(resolvables).map(key => provide(key, { useValue: resolvables[key].data }));
-    rawProviders.push(provide(UiView.INJECT.context, { useValue: config.viewDecl.$context }));
-    rawProviders.push(provide(UiView.INJECT.fqn, { useValue: uiViewData.fqn }));
+    rawProviders.push(provide(UiView.PARENT_INJECT, { useValue: { context: config.viewDecl.$context, fqn: uiViewData.fqn } }));
     let providers = Injector.resolve(rawProviders);
 
-    let exclusions = [UiView.INJECT.context, UiView.INJECT.fqn];
+    let exclusions = [UiView.PARENT_INJECT];
     providers = getProviders(injector).filter(x => exclusions.indexOf(x.key.displayName) === -1).concat(providers);
 
     // The 'controller' should be a Component class