fix(uiSref): Ensure URL once param checks pass

Fixes angular-ui#2091
ExpFront · Jun 23, 2016 · 627750d · 627750d
1 parent dfb426b
commit 627750d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/stateDirectives.js b/src/stateDirectives.js
@@ -120,21 +120,18 @@ function $StateRefDirective($state, $timeout) {
     require: ['?^uiSrefActive', '?^uiSrefActiveEq'],
     link: function(scope, element, attrs, uiSrefActive) {
       var ref    = parseStateRef(attrs.uiSref, $state.current.name);
-      var def    = { state: ref.state, href: null, nav: true, params: null };
+      var def    = { state: ref.state, href: null, params: null };
       var type   = getTypeInfo(element);
       var active = uiSrefActive[1] || uiSrefActive[0];
 
       def.options = extend(defaultOpts(element, $state), attrs.uiSrefOpts ? scope.$eval(attrs.uiSrefOpts) : {});
 
       var update = function(val) {
         if (val) def.params = angular.copy(val);
-        if (!def.nav) return;
-
         def.href = $state.href(ref.state, def.params, def.options);
-        def.nav = (def.href !== null);
 
         if (active) active.$$addStateInfo(ref.state, def.params);
-        if (def.nav) attrs.$set(type.attr, def.href);
+        if (def.href !== null) attrs.$set(type.attr, def.href);
       };
 
       if (ref.paramExpr) {

diff --git a/test/stateDirectivesSpec.js b/test/stateDirectivesSpec.js
@@ -12,7 +12,7 @@ describe('uiStateRef', function() {
       url: '/contacts',
       template: '<a ui-sref=".item({ id: 5 })" class="item">Person</a> <ui-view></ui-view>'
     }).state('contacts.item', {
-      url: '/:id',
+      url: '/{id:int}',
       template: '<a ui-sref=".detail" class="item-detail">Detail</a> | <a ui-sref="^" class="item-parent">Parent</a> | <ui-view></ui-view>'
     }).state('contacts.item.detail', {
       template: '<div class="title">Detail</div> | <a ui-sref="^" class="item-parent2">Item</a>'
@@ -130,7 +130,7 @@ describe('uiStateRef', function() {
       $q.flush();
 
       expect($state.current.name).toEqual('contacts.item.detail');
-      expect($stateParams).toEqual({ id: "5" });
+      expect($stateParams).toEqual({ id: 5 });
     }));
 
     it('should transition when given a click that contains no data (fake-click)', inject(function($state, $stateParams, $q) {
@@ -147,7 +147,7 @@ describe('uiStateRef', function() {
       $q.flush();
 
       expect($state.current.name).toEqual('contacts.item.detail');
-      expect($stateParams).toEqual({ id: "5" });
+      expect($stateParams).toEqual({ id: 5 });
     }));
 
     it('should not transition states when ctrl-clicked', inject(function($state, $stateParams, $q) {
@@ -393,7 +393,7 @@ describe('uiStateRef', function() {
       $q.flush();
 
       expect($state.$current.name).toBe("contacts.item.detail");
-      expect($state.params).toEqual({ id: "5" });
+      expect($state.params).toEqual({ id: 5 });
     }));
 
     it('should resolve states from parent uiView', inject(function ($state, $stateParams, $q, $timeout) {