fix(ngOptions): don't $dirty multiple select after compilation

Closes #13211 Closes #13326
angular · Nov 23, 2015 · f163c90 · f163c90
1 parent 4e94864
commit f163c90
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/ng/directive/ngOptions.js b/src/ng/directive/ngOptions.js
@@ -737,7 +737,8 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
         // Check to see if the value has changed due to the update to the options
         if (!ngModelCtrl.$isEmpty(previousValue)) {
           var nextValue = selectCtrl.readValue();
-          if (ngOptions.trackBy ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
+          var isNotPrimitive = ngOptions.trackBy || multiple;
+          if (isNotPrimitive ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
             ngModelCtrl.$setViewValue(nextValue);
             ngModelCtrl.$render();
           }

diff --git a/test/ng/directive/ngOptionsSpec.js b/test/ng/directive/ngOptionsSpec.js
@@ -2645,5 +2645,20 @@ describe('ngOptions', function() {
       expect(scope.value).toBe('third');
       expect(element).toEqualSelectValue('third');
     }));
+
+    it('should not set $dirty with select-multiple after compilation', function() {
+      scope.values = ['a', 'b'];
+      scope.selected = ['b'];
+
+      createSelect({
+        'ng-model':'selected',
+        'multiple':true,
+        'ng-options':'value for value in values',
+        'name': 'select'
+      });
+
+      expect(element.find('option')[1].selected).toBe(true);
+      expect(scope.form.select.$pristine).toBe(true);
+    });
   });
 });