Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 4f7af22

Browse files
committed
fix(select): fix empty attribute for selected not selecting options
closes #2114
1 parent e9f5a99 commit 4f7af22

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/components/select/select.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $interpolate,
229229

230230
function setAriaLabel() {
231231
var labelText = element.attr('placeholder');
232-
if (!labelText) {
233-
labelText = containerCtrl.element.find('label').text();
232+
if (!labelText && containerCtrl && containerCtrl.label) {
233+
labelText = containerCtrl.label.text();
234234
}
235235
$mdAria.expect(element, 'aria-label', labelText);
236236
}
@@ -648,6 +648,7 @@ function OptionDirective($mdButtonInkRipple, $mdUtil) {
648648
scope.$$postDigest(function() {
649649
attr.$observe('selected', function(selected) {
650650
if (!angular.isDefined(selected)) return;
651+
if (typeof selected == 'string') selected = true;
651652
if (selected) {
652653
if (!selectCtrl.isMultiple) {
653654
selectCtrl.deselect( Object.keys(selectCtrl.selected)[0] );

0 commit comments

Comments
 (0)