8000 fix(select): Select option with ngOptions when label equals $viewValue by felixcoto · Pull Request #11171 · angular/angular.js · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(select): Select option with ngOptions when label equals $viewValue #11171

Closed
wants to merge 4 commits into from
Closed

fix(select): Select option with ngOptions when label equals $viewValue #11171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6db5338
fix(select): Select option with ngOptions when label equals $viewValue
felixcoto Feb 24, 2015
1d67577
fix(select): Select option with ngOptions when label equals $viewValue
felixcoto Feb 24, 2015
7d6efe7
fix(select): Select option with ngOptions when label equals $viewValue
felixcoto Feb 24, 2015
d2bdf87
fix(select): Select option with ngOptions when label equals $viewValue
felixcoto Feb 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/ng/directive/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
optionsMap = {},
ngModelCtrl = nullModelCtrl,
nullOption,
unknownOption;
unknownOption,
optionsExp = $attrs.ngOptions;


self.databound = $attrs.ngModel;
Expand All @@ -222,7 +223,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
assertNotHasOwnProperty(value, '"option value"');
optionsMap[value] = true;

if (ngModelCtrl.$viewValue == value) {
if (isUndefined(optionsExp) && ngModelCtrl.$viewValue == value) {
$element.val(value);
if (unknownOption.parent()) unknownOption.remove();
}
Expand All @@ -238,7 +239,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
self.removeOption = function(value) {
if (this.hasOption(value)) {
delete optionsMap[value];
if (ngModelCtrl.$viewValue === value) {
if (isUndefined(optionsExp) && ngModelCtrl.$viewValue === value) {
this.renderUnknownOption(value);
}
}
Expand Down
21 changes: 21 additions & 0 deletions test/ng/directive/selectSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,9 +1887,30 @@ describe('select', function() {
expect(option.val()).toBe('?');
expect(option.text()).toBe('');
});

it('should select the correct option when label equals $viewValue', function() {
scope.numbersArray = ["Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten"];
scope.values= {};
scope.selected='Four';
createSelect({
'ng-model': 'selected',
'ng-options': 'option.value as option.value for option in values'
});

scope.$apply(function() {
scope.values=scope.numbersArray.map(function(value, index) {
return {
id: index,
value: value
};
});
});
expect(element[0].selectedIndex).toBe(4);
});
});



describe('blank option', function() {

it('should be compiled as template, be watched and updated', function() {
Expand Down
0