Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-14 09:43:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ng:repeat ignores prototype keys

Browse source
This commit is contained in:
Misko Hevery 2010-07-09 14:45:29 -07:00
parent 00bb790392
commit 228b54aa2e
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/java $@

3
src/directives.js
View file

@ -162,8 +162,9 @@ angularWidget("@ng:repeat", function(expression, element){
var children = [], currentScope = this; var children = [], currentScope = this;
this.$onEval(function(){ this.$onEval(function(){
var index = 0, childCount = children.length, childScope, lastElement = reference, var index = 0, childCount = children.length, childScope, lastElement = reference,
collection = this.$tryEval(rhs, reference); collection = this.$tryEval(rhs, reference), is_array = isArray(collection);
for ( var key in collection) { for ( var key in collection) {
if (is_array && !collection.hasOwnProperty(key)) break;
if (index < childCount) { if (index < childCount) {
// reuse existing child // reuse existing child
childScope = children[index]; childScope = children[index];

8
test/directivesSpec.js
View file

@ -93,15 +93,17 @@ describe("directives", function(){
it('should ng:repeat over array', function(){ it('should ng:repeat over array', function(){
var scope = compile('<ul><li ng:repeat="item in items" ng:init="suffix = \';\'" ng:bind="item + suffix"></li></ul>'); var scope = compile('<ul><li ng:repeat="item in items" ng:init="suffix = \';\'" ng:bind="item + suffix"></li></ul>');
scope.$set('items', ['misko', 'shyam']); Array.prototype.extraProperty = "should be ignored";
scope.items = ['misko', 'shyam'];
scope.$eval(); scope.$eval();
expect(element.text()).toEqual('misko;shyam;'); expect(element.text()).toEqual('misko;shyam;');
delete Array.prototype.extraProperty;
scope.$set('items', ['adam', 'kai', 'brad']); scope.items = ['adam', 'kai', 'brad'];
scope.$eval(); scope.$eval();
expect(element.text()).toEqual('adam;kai;brad;'); expect(element.text()).toEqual('adam;kai;brad;');
scope.$set('items', ['brad']); scope.items = ['brad'];
scope.$eval(); scope.$eval();
expect(element.text()).toEqual('brad;'); expect(element.text()).toEqual('brad;');
}); });