fix(directives): make ng:class-even/odd work with ng:class

Closes #508

1 files changed, 3 insertions, 0 deletions

diff --git a/src/directives.js b/src/directives.js
index 8ba5bace..937d0cca 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -546,8 +546,11 @@ function ngClass(selector) {
     return function(element) {
       this.$watch(function(scope) {
         if (selector(scope.$index)) {
+          var ngClassVal = scope.$eval(element.attr('ng:class'));
+          if (isArray(ngClassVal)) ngClassVal = ngClassVal.join(' ');
           var value = scope.$eval(expression);
           if (isArray(value)) value = value.join(' ');
+          if (ngClassVal && ngClassVal !== value) value = value + ' ' + ngClassVal;
           element[0].className = trim(existing + value);
         }
       });