fix(ngOptions): add / remove 'selected' attribute when select[multiple]

Author: Narretz

src/ng/directive/ngOptions.js

@@ -510,11 +510,19 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
             option.element.selected = false;
           });
 
-          if (value) {
+          if (value && value.length) {
             value.forEach(function(item) {
               var option = options.getOptionFromViewValue(item);
-              if (option) option.element.selected = true;
+              if (option) {
+                option.element.selected = true;
+                option.element.setAttribute('selected', 'selected');
+              }
             });
+
+            selectCtrl.unselectEmptyOption();
+
+          } else if (providedEmptyOption) {
+            selectCtrl.selectEmptyOption();
           }
         };
 

src/ng/directive/select.js

@@ -72,6 +72,7 @@ var SelectController =
 
   self.unselectEmptyOption = function() {
     if (self.hasEmptyOption) {
+      self.emptyOption[0].selected = false;
       self.emptyOption.removeAttr('selected');
     }
   };

test/ng/directive/ngOptionsSpec.js

@@ -2841,6 +2841,33 @@ describe('ngOptions', function() {
 
       expect(element.find('option')[0].selected).toEqual(false);
     });
+
+
+    it('should add / remove the "selected" attribute on selected / unselected options', function() {
+      scope.values = [
+        {name:'black'},
+        {name:'white'},
+        {name:'red'}
+      ];
+      scope.selected = [scope.values[2]];
+
+      createMultiSelect('<option value="">blank</option>');
+      scope.$apply();
+      expect(element.find('option')[0].value).toBe('');
+
+      expect(element.find('option')[0]).not.toBeMarkedAsSelected();
+      expect(element.find('option')[3]).toBeMarkedAsSelected();
+
+      scope.$apply('selected = []');
+      expect(element.find('option')[0]).toBeMarkedAsSelected();
+
+      scope.selected = [scope.values[1], scope.values[2]];
+      scope.$apply();
+      expect(element.find('option')[0]).not.toBeMarkedAsSelected();
+      expect(element.find('option')[2]).toBeMarkedAsSelected();
+      expect(element.find('option')[3]).toBeMarkedAsSelected();
+    });
+
   });