fix(select): multiple select clears on undefined ngModel

closes #2921
angular · Aug 14, 2015 · 346198a · 346198a
1 parent cca1955
commit 346198a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/components/select/select.js b/src/components/select/select.js
@@ -610,7 +610,7 @@ function SelectMenuDirective($parse, $mdUtil, $mdTheming) {
     };
 
     function renderMultiple() {
-      var newSelectedValues = self.ngModel.$modelValue || self.ngModel.$viewValue;
+      var newSelectedValues = self.ngModel.$modelValue || self.ngModel.$viewValue || [];
       if (!angular.isArray(newSelectedValues)) return;
 
       var oldSelected = Object.keys(self.selected);

diff --git a/src/components/select/select.spec.js b/src/components/select/select.spec.js
@@ -463,6 +463,15 @@ describe('<md-select>', function() {
         expect($rootScope.model).toEqual([]);
       }));
 
+      it('renders nothing if undefined is set', inject(function($rootScope) {
+        $rootScope.model = [1, 2];
+        var el = setupMultiple('ng-model="$root.model"', [1,2,3,4]);
+        expect(selectedOptions(el).length).toBe(2);
+        $rootScope.$apply('model = undefined');
+        $rootScope.$digest();
+        expect(selectedOptions(el).length).toBe(0);
+      }));
+
       it('adding a valid value to the model selects its option', inject(function($rootScope) {
         $rootScope.model = [];
         var el = setupMultiple('ng-model="$root.model"', [1,2,3,4]);