fix(select): fix select not setting initial value

closes #1699, closes #1760
angular · Mar 3, 2015 · 6dc46d5 · 6dc46d5
1 parent a4ec890
commit 6dc46d5
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/components/select/select.js b/src/components/select/select.js
@@ -127,12 +127,10 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $interpolate, $compile,
       createSelect();
 
       var originalRender = ngModel.$render;
+
       ngModel.$render = function() {
         originalRender();
-        if (selectContainer) {
-          var selectMenuCtrl = selectContainer.find('md-select-menu').controller('mdSelectMenu');
-          mdSelectCtrl.setLabelText(selectMenuCtrl.selectedLabels());
-        }
+        syncLabelText();
       };
 
       mdSelectCtrl.setLabelText = function(text) {
@@ -147,6 +145,15 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $interpolate, $compile,
         val ? labelEl.addClass('md-placeholder') : labelEl.removeClass('md-placeholder');
       };
 
+      scope.$$postDigest(syncLabelText);
+
+      function syncLabelText() {
+        if (selectContainer) {
+          var selectMenuCtrl = selectContainer.find('md-select-menu').controller('mdSelectMenu');
+          mdSelectCtrl.setLabelText(selectMenuCtrl.selectedLabels());
+        }
+      }
+
       attr.$observe('disabled', function(disabled) {
         if (disabled !== undefined) {
           element.attr('tabindex', -1);