Merge pull request #1361 from angular-ui/issue-1314

christopherthielen · christopherthielen · commit 0a9aa0c031be · 2014-09-11T20:35:14.000-05:00
fix(uiSref): Check that state is defined in isMatch()
diff --git a/src/stateDirectives.js b/src/stateDirectives.js
@@ -251,7 +251,7 @@ function $StateRefActiveDirective($state, $stateParams, $interpolate) {
         if (typeof $attrs.uiSrefActiveEq !== 'undefined') {
           return $state.$current.self === state && matchesParams();
         } else {
-          return $state.includes(state.name) && matchesParams();
+          return state && $state.includes(state.name) && matchesParams();
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ function $StateRefActiveDirective($state, $stateParams, $interpolate) {`
`251`	`251`	`if (typeof $attrs.uiSrefActiveEq !== 'undefined') {`
`252`	`252`	`return $state.$current.self === state && matchesParams();`
`253`	`253`	`} else {`
`254`		`- return $state.includes(state.name) && matchesParams();`
	`254`	`+ return state && $state.includes(state.name) && matchesParams();`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`