fix(ng2.uiSref): Fix anchor href generation

fix(ng2.uiSref): Fix relative srefs
angular-ui · Apr 3, 2016 · 98b5b42 · 98b5b42
1 parent fcb15c5
commit 98b5b42
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/ng2/directives.ts b/src/ng2/directives.ts
@@ -1,4 +1,4 @@
-import {UiSref} from "../ng2/uiSref";
+import {UiSref, AnchorUiSref} from "../ng2/uiSref";
 import {UiSrefActive} from "../ng2/uiSrefActive";
 import {UiView} from "../ng2/uiView";
 import {UiSrefStatus} from "./uiSrefStatus";
@@ -8,4 +8,4 @@ export * from "./uiSref";
 export * from "./uiSrefStatus";
 export * from "./uiSrefActive";
 
-export let UIROUTER_DIRECTIVES = [UiSref, UiView, UiSrefActive, UiSrefStatus];
+export let UIROUTER_DIRECTIVES = [UiSref, AnchorUiSref, UiView, UiSrefActive, UiSrefStatus];
diff --git a/src/ng2/providers.ts b/src/ng2/providers.ts
@@ -49,7 +49,7 @@ export const UIROUTER_PROVIDERS: Provider[] = [
 
   provide(UIRouterGlobals, { useFactory: (r: UIRouter) => { return r.globals; }, deps: [UIRouter]}),
 
-  provide(UiView.INJECT.context, { useFactory: (r: StateRegistry) => { console.log(r); return r.root(); }, deps: [StateRegistry]} ),
+  provide(UiView.INJECT.context, { useFactory: (r: StateRegistry) => { return r.root(); }, deps: [StateRegistry]} ),
 
   provide(UiView.INJECT.fqn, { useValue: null })
 

diff --git a/src/ng2/uiSref.ts b/src/ng2/uiSref.ts
@@ -1,16 +1,18 @@
 /** @module ng2 */ /** */
 import {UIRouter} from "../router";
-import {Directive} from "angular2/core";
+import {Directive, Inject} from "angular2/core";
 import {Optional} from "angular2/core";
-import {Input} from "angular2/core";
 import {ElementRef} from "angular2/core";
 import {Renderer} from "angular2/core";
+import {UiView} from "./uiView";
+import {ViewContext} from "../view/interface";
+import {extend} from "../common/common";
 
 @Directive({ selector: 'a[uiSref]' })
 export class AnchorUiSref {
-  constructor( public _el: ElementRef, public _renderer: Renderer) { }
+  constructor(public _el: ElementRef, public _renderer: Renderer) { }
   update(href) {
-    this._renderer.setElementProperty(this._el, 'href', href);
+    this._renderer.setElementProperty(this._el.nativeElement, 'href', href);
   }
 }
 
@@ -26,6 +28,7 @@ export class UiSref {
 
   constructor(
       private _router: UIRouter,
+      @Inject(UiView.INJECT.context) public context: ViewContext,
       @Optional() private _anchorUiSref: AnchorUiSref
   ) { }
 
@@ -39,12 +42,17 @@ export class UiSref {
 
   update() {
     if (this._anchorUiSref) {
-      this._anchorUiSref.update(this._router.stateService.href(this.state, this.params));
+      this._anchorUiSref.update(this._router.stateService.href(this.state, this.params, this.getOptions()));
     }
   }
 
+  getOptions() {
+    let defOpts = { relative: this.context.name, inherit: true };
+    return extend(defOpts, this.options || {});
+  }
+
   go() {
-    this._router.stateService.go(this.state, this.params, this.options);
+    this._router.stateService.go(this.state, this.params, this.getOptions());
     return false;
   }
 }

diff --git a/src/ng2/uiView.ts b/src/ng2/uiView.ts
@@ -67,7 +67,6 @@ export class UiView {
   ngOnInit() {
     let parentFqn = this.parentFqn;
     let name = this.name || '$default';
-    console.log(`parentFqn: ${parentFqn}`);
 
     this.uiViewData = {
       id: id++,