fix(select): fix empty attribute for selected not selecting options

closes #2114
angular · Jun 28, 2015 · 4f7af22 · 4f7af22
1 parent e9f5a99
commit 4f7af22
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/select/select.js b/src/components/select/select.js
@@ -229,8 +229,8 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $interpolate,
 
       function setAriaLabel() {
         var labelText = element.attr('placeholder');
-        if (!labelText) {
-          labelText = containerCtrl.element.find('label').text();
+        if (!labelText && containerCtrl && containerCtrl.label) {
+          labelText = containerCtrl.label.text();
         }
         $mdAria.expect(element, 'aria-label', labelText);
       }
@@ -648,6 +648,7 @@ function OptionDirective($mdButtonInkRipple, $mdUtil) {
     scope.$$postDigest(function() {
       attr.$observe('selected', function(selected) {
         if (!angular.isDefined(selected)) return;
+        if (typeof selected == 'string') selected = true;
         if (selected) {
           if (!selectCtrl.isMultiple) {
             selectCtrl.deselect( Object.keys(selectCtrl.selected)[0] );