diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js index a62f706c52da..9fd2077dca65 100644 --- a/src/ng/directive/select.js +++ b/src/ng/directive/select.js @@ -406,6 +406,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) { modelValue = ctrl.$modelValue, values = valuesFn(scope) || [], keys = keyName ? sortedKeys(values) : values, + key, groupLength, length, groupIndex, index, locals = {}, @@ -429,8 +430,17 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) { // We now build up the list of options we need (we merge later) for (index = 0; length = keys.length, index < length; index++) { - locals[valueName] = values[keyName ? locals[keyName]=keys[index]:index]; - optionGroupName = groupByFn(scope, locals) || ''; + + key = index; + if (keyName) { + key = keys[index]; + if ( key.charAt(0) === '$' ) continue; + locals[keyName] = key; + } + + locals[valueName] = values[key]; + + optionGroupName = groupByFn(scope, locals) || ''; if (!(optionGroup = optionGroups[optionGroupName])) { optionGroup = optionGroups[optionGroupName] = []; optionGroupNames.push(optionGroupName); diff --git a/test/ng/directive/selectSpec.js b/test/ng/directive/selectSpec.js index 5906ce99b38c..584fe6140e59 100644 --- a/test/ng/directive/selectSpec.js +++ b/test/ng/directive/selectSpec.js @@ -692,6 +692,21 @@ describe('select', function() { expect(jqLite(element.find('option')[0]).text()).toEqual('blank'); }); + it('should ignore $ and $$ properties', function() { + createSelect({ + 'ng-options': 'key as value for (key, value) in object', + 'ng-model': 'selected' + }); + + scope.$apply(function() { + scope.object = {'regularProperty': 'visible', '$$private': 'invisible', '$property': 'invisible'}; + scope.selected = 'regularProperty'; + }); + + var options = element.find('option'); + expect(options.length).toEqual(1); + expect(sortedHtml(options[0])).toEqual(''); + }); describe('binding', function() {