revert(select): avoid checking option element selected properties in render

Erin Altenhof-Long · petebacondarwin · commit 61871da9de5f · 2014-07-30T23:14:39.000+01:00
This reverts commit dc149de. That commit fixes a bug caused by Firefox updating `select.value` on hover. However, it causes other bugs with select including the issue described in angular#7715. This issue details how selects with a blank disabled option skip to the second option. We filed a bug with Firefox for the problematic behavior the reverted commit addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1039047, and alternate Angular fixes are being investigated. Closes angular#7715 angular#7855
diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
@@ -395,12 +395,6 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                   value = valueFn(scope, locals);
                 }
               }
-              // Update the null option's selected property here so $render cleans it up correctly
-              if (optionGroupsCache[0].length > 1) {
-                if (optionGroupsCache[0][1].id !== key) {
-                  optionGroupsCache[0][1].selected = false;
-                }
-              }
             }
             ctrl.$setViewValue(value);
           });
@@ -538,7 +532,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                   lastElement.val(existingOption.id = option.id);
                 }
                 // lastElement.prop('selected') provided by jQuery has side-effects
-                if (existingOption.selected !== option.selected) {
+                if (lastElement[0].selected !== option.selected) {
                   lastElement.prop('selected', (existingOption.selected = option.selected));
                   if (msie) {
                     // See #7692
diff --git a/test/ng/directive/selectSpec.js b/test/ng/directive/selectSpec.js
@@ -733,27 +733,6 @@ describe('select', function() {
       expect(sortedHtml(options[2])).toEqual('<option value="1">3</option>');
     });
 
-    it('should not update selected property of an option element on digest with no change event',
-        function() {
-      createSingleSelect();
-
-      scope.$apply(function() {
-        scope.values = [{name: 'A'}, {name: 'B'}, {name: 'C'}];
-        scope.selected = scope.values[0];
-      });
-
-      var options = element.find('option');
-      var optionToSelect = options.eq(1);
-
-      expect(optionToSelect.text()).toBe('B');
-
-      optionToSelect.prop('selected', true);
-      scope.$digest();
-
-      expect(optionToSelect.prop('selected')).toBe(true);
-      expect(scope.selected).toBe(scope.values[0]);
-    });
-
     describe('binding', function() {
 
       it('should bind to scope value', function() {

Original file line number	Diff line number	Diff line change
`@@ -395,12 +395,6 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {`
`395`	`395`	`value = valueFn(scope, locals);`
`396`	`396`	`}`
`397`	`397`	`}`
`398`		`- // Update the null option's selected property here so $render cleans it up correctly`
`399`		`- if (optionGroupsCache[0].length > 1) {`
`400`		`- if (optionGroupsCache[0][1].id !== key) {`
`401`		`- optionGroupsCache[0][1].selected = false;`
`402`		`- }`
`403`		`- }`
`404`	`398`	`}`
`405`	`399`	`ctrl.$setViewValue(value);`
`406`	`400`	`});`
`@@ -538,7 +532,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {`
`538`	`532`	`lastElement.val(existingOption.id = option.id);`
`539`	`533`	`}`
`540`	`534`	`// lastElement.prop('selected') provided by jQuery has side-effects`
`541`		`- if (existingOption.selected !== option.selected) {`
	`535`	`+ if (lastElement[0].selected !== option.selected) {`
`542`	`536`	`lastElement.prop('selected', (existingOption.selected = option.selected));`
`543`	`537`	`if (msie) {`
`544`	`538`	`// See #7692`