release 0.2.17

Author: nateabele

CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="0.2.17"></a>
+### 0.2.17 (2016-01-25)
+
+
+#### Bug Fixes
+
+* **uiSrefActive:** allow multiple classes ([a89114a0](https://github.com/angular-ui/ui-router/commit/a89114a083813c1a7280c48fc18e626caa5a31f4), closes [#2481](https://github.com/angular-ui/ui-router/issues/2481), [#2482](https://github.com/angular-ui/ui-router/issues/2482))
+
+
 <a name="0.2.16"></a>
 ### 0.2.16 (2016-01-24)
 

README.md

@@ -2,7 +2,7 @@
 
 #### The de-facto solution to flexible routing with nested views
 ---
-**[Download 0.2.16](http://angular-ui.github.io/ui-router/release/angular-ui-router.js)** (or **[Minified](http://angular-ui.github.io/ui-router/release/angular-ui-router.min.js)**) **|**
+**[Download 0.2.17](http://angular-ui.github.io/ui-router/release/angular-ui-router.js)** (or **[Minified](http://angular-ui.github.io/ui-router/release/angular-ui-router.min.js)**) **|**
 **[Guide](https://github.com/angular-ui/ui-router/wiki) |**
 **[API](http://angular-ui.github.io/ui-router/site) |**
 **[Sample](http://angular-ui.github.com/ui-router/sample/) ([Src](https://github.com/angular-ui/ui-router/tree/gh-pages/sample)) |**

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-router",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "license" : "MIT",
   "main": "./release/angular-ui-router.js",
   "dependencies": {

component.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-router",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "State-based routing for AngularJS",
   "keywords": [
     "angular",

package.json

@@ -1,14 +1,19 @@
 {
   "name": "angular-ui-router",
   "description": "State-based routing for AngularJS",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "homepage": "http://angular-ui.github.com/",
   "contributors": [
     {
       "name": "Nate Abele",
-      "email": "nate@unionofrad.com",
+      "email": "nate@radify.io",
       "web": "https://github.com/nateabele"
     },
+    {
+      "name": "Chris Thielen",
+      "email": "[email protected]",
+      "web": "https://github.com/christopherthielen"
+    },
     {
       "name": "Tim Kindberg",
       "web": "https://github.com/timkindberg"

release/angular-ui-router.js

@@ -1,6 +1,6 @@
 /**
  * State-based routing for AngularJS
- * @version v0.2.16
+ * @version v0.2.17
  * @link http://angular-ui.github.com/
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
@@ -4384,14 +4384,20 @@ function $StateRefActiveDirective($state, $stateParams, $interpolate) {
   return  {
     restrict: "A",
     controller: ['$scope', '$element', '$attrs', '$timeout', function ($scope, $element, $attrs, $timeout) {
-      var states = [], activeClasses = {}, activeEqClass;
+      var states = [], activeClasses = {}, activeEqClass, uiSrefActive;
 
       // There probably isn't much point in $observing this
       // uiSrefActive and uiSrefActiveEq share the same directive object with some
       // slight difference in logic routing
       activeEqClass = $interpolate($attrs.uiSrefActiveEq || '', false)($scope);
 
-      var uiSrefActive = $scope.$eval($attrs.uiSrefActive) || $interpolate($attrs.uiSrefActive || '', false)($scope);
+      try {
+        uiSrefActive = $scope.$eval($attrs.uiSrefActive);
+      } catch (e) {
+        // Do nothing. uiSrefActive is not a valid expression.
+        // Fall back to using $interpolate below
+      }
+      uiSrefActive = uiSrefActive || $interpolate($attrs.uiSrefActive || '', false)($scope);
       if (isObject(uiSrefActive)) {
         forEach(uiSrefActive, function(stateOrName, activeClass) {
           if (isString(stateOrName)) {