From cb34293c1188ab76c1e0ced67e101173d7380dc8 Mon Sep 17 00:00:00 2001
From: Di Peng <pengdi@google.com>
Date: Tue, 9 Aug 2011 18:24:56 -0700
Subject: [PATCH 1/2] fix(directives): make ng:class-even/odd work with
 ng:class

Closes #508
---
 src/directives.js      |  3 +++
 test/directivesSpec.js | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/directives.js b/src/directives.js
index 4712f250c097..0659f13679e5 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -596,8 +596,11 @@ function ngClass(selector) {
     return function(element) {
       this.$observe(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);
         }
       });
diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index a05861ae9f4f..be06bc6cfe78 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -225,6 +225,22 @@ describe("directive", function(){
     expect(e2.hasClass('even')).toBeTruthy();
   });
 
+
+  it('should allow both ng:class and ng:class odd/even on the same element', function() {
+    var scope = compile('<ul><li ng:repeat="i in [0,1]" ng:class="\'plainClass\'" ' +
+        'ng:class-odd="\'odd\'" ng:class-even="\'even\'"></li><ul>');
+    scope.$flush();
+    var e1 = jqLite(element[0].childNodes[1]);
+    var e2 = jqLite(element[0].childNodes[2]);
+
+    expect(e1.hasClass('plainClass')).toBeTruthy();
+    expect(e1.hasClass('odd')).toBeTruthy();
+    expect(e2.hasClass('plainClass')).toBeTruthy();
+    expect(e2.hasClass('even')).toBeTruthy();
+
+  });
+
+
   describe('ng:style', function(){
     it('should set', function(){
       var scope = compile('<div ng:style="{height: \'40px\'}"></div>');

From 637faad12e107ed2b810c041893921b641327a8e Mon Sep 17 00:00:00 2001
From: Di Peng <pengdi@google.com>
Date: Wed, 10 Aug 2011 10:04:44 -0700
Subject: [PATCH 2/2] patch for prevoius commit, to be squashed

---
 test/directivesSpec.js | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index be06bc6cfe78..0ea420fb7b1d 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -226,18 +226,46 @@ describe("directive", function(){
   });
 
 
-  it('should allow both ng:class and ng:class odd/even on the same element', function() {
-    var scope = compile('<ul><li ng:repeat="i in [0,1]" ng:class="\'plainClass\'" ' +
-        'ng:class-odd="\'odd\'" ng:class-even="\'even\'"></li><ul>');
+  it('should allow both ng:class and ng:class-odd/even on the same element', function() {
+    var scope = compile('<ul>' +
+                          '<li ng:repeat="i in [0,1]" ng:class="\'plainClass\'" ' +
+                              'ng:class-odd="\'odd\'" ng:class-even="\'even\'"></li>' +
+                        '<ul>');
     scope.$flush();
     var e1 = jqLite(element[0].childNodes[1]);
     var e2 = jqLite(element[0].childNodes[2]);
 
     expect(e1.hasClass('plainClass')).toBeTruthy();
     expect(e1.hasClass('odd')).toBeTruthy();
+    expect(e1.hasClass('even')).toBeFalsy();
     expect(e2.hasClass('plainClass')).toBeTruthy();
     expect(e2.hasClass('even')).toBeTruthy();
+    expect(e2.hasClass('odd')).toBeFalsy();
+  });
+
+
+  it('should allow both ng:class and ng:class-odd/even with multiple classes', function() {
+    var scope = compile('<ul>' +
+                          '<li ng:repeat="i in [0,1]" ng:class="[\'A\', \'B\']" ' +
+                              'ng:class-odd="[\'C\', \'D\']" ng:class-even="[\'E\', \'F\']"></li>' +
+                        '<ul>');
+    scope.$flush();
+    var e1 = jqLite(element[0].childNodes[1]);
+    var e2 = jqLite(element[0].childNodes[2]);
 
+    expect(e1.hasClass('A')).toBeTruthy();
+    expect(e1.hasClass('B')).toBeTruthy();
+    expect(e1.hasClass('C')).toBeTruthy();
+    expect(e1.hasClass('D')).toBeTruthy();
+    expect(e1.hasClass('E')).toBeFalsy();
+    expect(e1.hasClass('F')).toBeFalsy();
+
+    expect(e2.hasClass('A')).toBeTruthy();
+    expect(e2.hasClass('B')).toBeTruthy();
+    expect(e2.hasClass('E')).toBeTruthy();
+    expect(e2.hasClass('F')).toBeTruthy();
+    expect(e2.hasClass('C')).toBeFalsy();
+    expect(e2.hasClass('D')).toBeFalsy();
   });