diff options
| author | Igor Minar | 2012-11-23 22:46:58 +0100 | 
|---|---|---|
| committer | Igor Minar | 2012-11-26 20:36:53 +0100 | 
| commit | d859dcecea654d1d858cd756c6efb8435a453197 (patch) | |
| tree | 30bfef8a52630e302349d03b2649632338423aa7 /src/ng/directive/ngClass.js | |
| parent | d3b32a7c9452e80b372c1b49f2c060ea5225b13e (diff) | |
| download | angular.js-d859dcecea654d1d858cd756c6efb8435a453197.tar.bz2 | |
fix(ngClassOdd/ngClassEven): support shrinking/reordering in repeaters
We need to watch $index in addition to cssClasses because only then
we can correctly respond to shrinking or reordered repeaters.
Closes #1076
Diffstat (limited to 'src/ng/directive/ngClass.js')
| -rw-r--r-- | src/ng/directive/ngClass.js | 56 | 
1 files changed, 43 insertions, 13 deletions
| diff --git a/src/ng/directive/ngClass.js b/src/ng/directive/ngClass.js index 13b0378a..76b0ed57 100644 --- a/src/ng/directive/ngClass.js +++ b/src/ng/directive/ngClass.js @@ -3,25 +3,55 @@  function classDirective(name, selector) {    name = 'ngClass' + name;    return ngDirective(function(scope, element, attr) { -    // Reusable function for re-applying the ngClass -    function ngClassWatchAction(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); -      } -    }; +      scope.$watch(attr[name], ngClassWatchAction, true);      attr.$observe('class', function(value) {        var ngClass = scope.$eval(attr[name]);        ngClassWatchAction(ngClass, ngClass);      }); + + +    if (name !== 'ngClass') { +      scope.$watch('$index', function($index, old$index) { +        var mod = $index % 2; +        if (mod !== old$index % 2) { +          if (mod == selector) { +            addClass(scope.$eval(attr[name])); +          } else { +            removeClass(scope.$eval(attr[name])); +          } +        } +      }); +    } + + +    function ngClassWatchAction(newVal, oldVal) { +      if (selector === true || scope.$index % 2 === selector) { +        if (oldVal && (newVal !== oldVal)) { +          removeClass(oldVal); +        } +        addClass(newVal); +      } +    } + + +    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); +      } +    }    });  } | 
