fix(select): fix md-select with no placeholder outside of

md-input-container closes #3483
angular · Jun 28, 2015 · 4be344b · 4be344b
1 parent 9a045fb
commit 4be344b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/select/select.js b/src/components/select/select.js
@@ -184,7 +184,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $interpolate,
       mdSelectCtrl.setLabelText = function(text) {
         mdSelectCtrl.setIsPlaceholder(!text);
         // Use placeholder attribute, otherwise fallback to the md-input-container label
-        var tmpPlaceholder = attr.placeholder || (containerCtrl.label ? containerCtrl.label.text() : '');
+        var tmpPlaceholder = attr.placeholder || (containerCtrl && containerCtrl.label ? containerCtrl.label.text() : '');
         text = text || tmpPlaceholder || '';
         var target = valueEl.children().eq(0);
         target.text(text);
@@ -372,7 +372,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $interpolate,
             element: selectContainer,
             target: element[0],
             hasBackdrop: true,
-            loadingAsync: attr.mdOnOpen ? scope.$eval(attr.mdOnOpen) || true : false,
+            loadingAsync: attr.mdOnOpen ? scope.$eval(attr.mdOnOpen) || true : false
           }).then(function(selectedText) {
             isOpen = false;
           });