Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

fix(select): auto-select new option that is marked as selected #8106

Merged
merged 1 commit into from
Jul 8, 2014
Merged
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions src/ng/directive/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,20 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
};


self.addOption = function(value) {
self.addOption = function(value, element) {
assertNotHasOwnProperty(value, '"option value"');
optionsMap[value] = true;

if (ngModelCtrl.$viewValue == value) {
$element.val(value);
if (unknownOption.parent()) unknownOption.remove();
}
// Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
// Adding an <option selected="selected"> element to a <select required="required"> should
// automatically select the new element
if (element[0].hasAttribute('selected')) {
element[0].selected = true;
}
};


Expand Down Expand Up @@ -625,10 +631,10 @@ var optionDirective = ['$interpolate', function($interpolate) {
if (oldVal !== newVal) {
selectCtrl.removeOption(oldVal);
}
selectCtrl.addOption(newVal);
selectCtrl.addOption(newVal, element);
});
} else {
selectCtrl.addOption(attr.value);
selectCtrl.addOption(attr.value, element);
}

element.on('$destroy', function() {
Expand Down