diff options
| -rw-r--r-- | src/ng/directive/ngRepeat.js | 9 | ||||
| -rw-r--r-- | test/ng/directive/ngRepeatSpec.js | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/ng/directive/ngRepeat.js b/src/ng/directive/ngRepeat.js index fdf79c02..b5fa60dd 100644 --- a/src/ng/directive/ngRepeat.js +++ b/src/ng/directive/ngRepeat.js @@ -205,7 +205,7 @@ var ngRepeatDirective = ['$parse', '$animator', function($parse, $animator) { var animate = $animator($scope, $attr); var expression = $attr.ngRepeat; var match = expression.match(/^\s*(.+)\s+in\s+(.*?)\s*(\s+track\s+by\s+(.+)\s*)?$/), - trackByExp, trackByExpGetter, trackByIdFn, lhs, rhs, valueIdentifier, keyIdentifier, + trackByExp, trackByExpGetter, trackByIdFn, trackByIdArrayFn, trackByIdObjFn, lhs, rhs, valueIdentifier, keyIdentifier, hashFnLocals = {$id: hashKey}; if (!match) { @@ -227,9 +227,12 @@ var ngRepeatDirective = ['$parse', '$animator', function($parse, $animator) { return trackByExpGetter($scope, hashFnLocals); }; } else { - trackByIdFn = function(key, value) { + trackByIdArrayFn = function(key, value) { return hashKey(value); } + trackByIdObjFn = function(key) { + return key; + } } match = lhs.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/); @@ -266,7 +269,9 @@ var ngRepeatDirective = ['$parse', '$animator', function($parse, $animator) { if (isArrayLike(collection)) { collectionKeys = collection; + trackByIdFn = trackByIdFn || trackByIdArrayFn; } else { + trackByIdFn = trackByIdFn || trackByIdObjFn; // if object, extract keys, sort them and use to determine order of iteration over obj props collectionKeys = []; for (key in collection) { diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js index 6506e060..0d1833c8 100644 --- a/test/ng/directive/ngRepeatSpec.js +++ b/test/ng/directive/ngRepeatSpec.js @@ -89,6 +89,15 @@ describe('ngRepeat', function() { expect(element.text()).toEqual('misko:swe|shyam:set|'); }); + it('should iterate over an object/map with identical values', function() { + element = $compile( + '<ul>' + + '<li ng-repeat="(key, value) in items">{{key}}:{{value}}|</li>' + + '</ul>')(scope); + scope.items = {age:20, wealth:20, prodname: "Bingo", dogname: "Bingo", codename: "20"}; + scope.$digest(); + expect(element.text()).toEqual('age:20|codename:20|dogname:Bingo|prodname:Bingo|wealth:20|'); + }); describe('track by', function() { it('should track using expression function', function() { |