From 52a263add5741443f2958aec083811cec72dfa92 Mon Sep 17 00:00:00 2001
From: petrovalex <petrov.alexander1@gmail.com>
Date: Tue, 14 Aug 2012 20:38:05 +0300
Subject: [PATCH 1/2] fix(ngClassOdd/Even): proper update with filter

---
 src/ng/directive/ngClass.js      | 35 ++++++++++++++++++++-----
 test/ng/directive/ngClassSpec.js | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/src/ng/directive/ngClass.js b/src/ng/directive/ngClass.js
index e054d4c6d7a4..9b0f93bfde8c 100644
--- a/src/ng/directive/ngClass.js
+++ b/src/ng/directive/ngClass.js
@@ -3,17 +3,38 @@
 function classDirective(name, selector) {
   name = 'ngClass' + name;
   return ngDirective(function(scope, element, attr) {
+    if (selector !== true) {
+      scope.$watch("$index", function(newVal, oldVal) {
+        if (newVal !== oldVal && ((newVal + oldVal) % 2 === 1)) {          
+          if (newVal % 2 !== selector) {
+            removeClass(scope.$eval(attr[name]));
+          } else {
+            addClass(scope.$eval(attr[name]));
+          }
+        }
+      }, true);
+    }
+
     scope.$watch(attr[name], function(newVal, oldVal) {
       if (selector === true || scope.$index % 2 === selector) {
         if (oldVal && (newVal !== oldVal)) {
-           if (isObject(oldVal) && !isArray(oldVal))
-             oldVal = map(oldVal, function(v, k) { if (v) return k });
-           element.removeClass(isArray(oldVal) ? oldVal.join(' ') : oldVal);
-         }
-         if (isObject(newVal) && !isArray(newVal))
-            newVal = map(newVal, function(v, k) { if (v) return k });
-         if (newVal) element.addClass(isArray(newVal) ? newVal.join(' ') : newVal);      }
+          removeClass(oldVal);                    
+        }
+        addClass(newVal);
+      }
     }, true);
+
+    function removeClass(classVal) {
+      if (isObject(classVal) && !isArray(classVal))
+             classVal = map(classVal, function(v, k) { if (v) return k });
+           element.removeClass(isArray(classVal) ? classVal.join(' ') : classVal);
+    }
+
+    function addClass(classVal) {
+      if (isObject(classVal) && !isArray(classVal))
+            classVal = map(classVal, function(v, k) { if (v) return k });
+         if (classVal) element.addClass(isArray(classVal) ? classVal.join(' ') : classVal);
+    }
   });
 }
 
diff --git a/test/ng/directive/ngClassSpec.js b/test/ng/directive/ngClassSpec.js
index e8685b7dc0bb..7604f3820737 100644
--- a/test/ng/directive/ngClassSpec.js
+++ b/test/ng/directive/ngClassSpec.js
@@ -201,4 +201,48 @@ describe('ngClass', function() {
     expect(e2.hasClass('C')).toBeFalsy();
     expect(e2.hasClass('D')).toBeFalsy();
   }));
+
+
+  it('should update ngClassOdd/Even when model is changed by filtering', inject(function($rootScope, $compile) {
+    element = $compile('<ul>' +
+      '<li ng-repeat="i in items" ' +
+      'ng-class-odd="\'odd\'" ng-class-even="\'even\'"></li>' +
+      '<ul>')($rootScope);
+    $rootScope.items = ['a','b','a'];
+    $rootScope.$digest();
+
+    $rootScope.items = ['a','a'];
+    $rootScope.$digest();
+
+    var e1 = jqLite(element[0].childNodes[1]);
+    var e2 = jqLite(element[0].childNodes[2]);
+
+    expect(e1.hasClass('odd')).toBeTruthy();
+    expect(e1.hasClass('even')).toBeFalsy();
+
+    expect(e2.hasClass('even')).toBeTruthy();
+    expect(e2.hasClass('odd')).toBeFalsy();
+  }));
+
+
+  it('should update ngClassOdd/Even when model is changed by sorting', inject(function($rootScope, $compile) {
+    element = $compile('<ul>' +
+      '<li ng-repeat="i in items" ' +
+      'ng-class-odd="\'odd\'" ng-class-even="\'even\'">i</li>' +
+      '<ul>')($rootScope);
+    $rootScope.items = ['a','b'];
+    $rootScope.$digest();
+
+    $rootScope.items = ['b','a'];
+    $rootScope.$digest();
+
+    var e1 = jqLite(element[0].childNodes[1]);
+    var e2 = jqLite(element[0].childNodes[2]);
+
+    expect(e1.hasClass('odd')).toBeTruthy();
+    expect(e1.hasClass('even')).toBeFalsy();
+
+    expect(e2.hasClass('even')).toBeTruthy();
+    expect(e2.hasClass('odd')).toBeFalsy();
+  }));
 });

From b70934137d7a3825daba3b8262a6347a48fd26c7 Mon Sep 17 00:00:00 2001
From: petrovalex <petrov.alexander1@gmail.com>
Date: Tue, 14 Aug 2012 22:45:01 +0300
Subject: [PATCH 2/2] indentation fix

---
 src/ng/directive/ngClass.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ng/directive/ngClass.js b/src/ng/directive/ngClass.js
index 9b0f93bfde8c..9f9faf50bcc6 100644
--- a/src/ng/directive/ngClass.js
+++ b/src/ng/directive/ngClass.js
@@ -26,14 +26,14 @@ function classDirective(name, selector) {
 
     function removeClass(classVal) {
       if (isObject(classVal) && !isArray(classVal))
-             classVal = map(classVal, function(v, k) { if (v) return k });
-           element.removeClass(isArray(classVal) ? classVal.join(' ') : classVal);
+        classVal = map(classVal, function(v, k) { if (v) return k });
+      element.removeClass(isArray(classVal) ? classVal.join(' ') : classVal);
     }
 
     function addClass(classVal) {
       if (isObject(classVal) && !isArray(classVal))
-            classVal = map(classVal, function(v, k) { if (v) return k });
-         if (classVal) element.addClass(isArray(classVal) ? classVal.join(' ') : classVal);
+        classVal = map(classVal, function(v, k) { if (v) return k });
+      if (classVal) element.addClass(isArray(classVal) ? classVal.join(' ') : classVal);
     }
   });
 }