refactor($state): simplify include()

angular-ui · Mar 25, 2014 · 0da45a1 · 0da45a1 · nateabele · Aug 28, 2014
1 parent 34207b1
commit 0da45a1
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/state.js b/src/state.js
@@ -1043,29 +1043,20 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
 
     $state.includes = function includes(stateOrName, params) {
       if (isString(stateOrName) && isGlob(stateOrName)) {
-        if (doesStateMatchGlob(stateOrName)) {
-          stateOrName = $state.$current.name;
-        } else {
+        if (!doesStateMatchGlob(stateOrName)) {
           return false;
         }
+        stateOrName = $state.$current.name;
       }
-
       var state = findState(stateOrName);
+
       if (!isDefined(state)) {
         return undefined;
       }
-
       if (!isDefined($state.$current.includes[state.name])) {
         return false;
       }
-
-      var validParams = true;
-      angular.forEach(params, function(value, key) {
-        if (!isDefined($stateParams[key]) || $stateParams[key] !== value) {
-          validParams = false;
-        }
-      });
-      return validParams;
+      return equalForKeys(params, $stateParams);
     };