fix(ngOptions): skip comments when looking for option elements

Narretz · Narretz · commit 7f3f3dd3ebcc · 2015-09-27T15:08:35.000+02:00
When the empty/blank option has a directive that transcludes, ngIf for example, a comment will be added into the select. Previously, ngOptions used this comment as the empty option, which would mess up the displayed options. Closes angular#12190
diff --git a/src/ng/directive/ngOptions.js b/src/ng/directive/ngOptions.js
@@ -626,7 +626,10 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
         if (emptyOption_ || unknownOption_) {
           while (current &&
                 (current === emptyOption_ ||
-                current === unknownOption_)) {
+                current === unknownOption_ ||
+                emptyOption_ && emptyOption_.nodeType === NODE_TYPE_COMMENT)) {
+            // Empty options might have directives that transclude
+            // and insert comments (e.g. ngIf)
             current = current.nextSibling;
           }
         }
diff --git a/test/ng/directive/ngOptionsSpec.js b/test/ng/directive/ngOptionsSpec.js
@@ -2095,6 +2095,30 @@ describe('ngOptions', function() {
       expect(element[0].selectedIndex).toEqual(0);
       expect(scope.selected).toEqual([]);
     });
+
+
+    it('should be possible to use ngIf in the blank option', function() {
+      var option;
+      createSingleSelect('<option ng-if="isBlank" value="">blank</option>');
+
+      scope.$apply(function() {
+        scope.values = [{name: 'A'}];
+        scope.isBlank = true;
+      });
+
+      expect(element.find('option').length).toBe(2);
+      option = element.find('option').eq(0);
+      expect(option.val()).toBe('');
+      expect(option.text()).toBe('blank');
+
+      scope.$apply(function() {
+        scope.isBlank = false;
+      });
+
+      expect(element.find('option').length).toBe(1);
+      option = element.find('option').eq(0);
+      expect(option.text()).toBe('A');
+    });
   });
 
 

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,10 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {`
`626`	`626`	`if (emptyOption_ \|\| unknownOption_) {`
`627`	`627`	`while (current &&`
`628`	`628`	`(current === emptyOption_ \|\|`
`629`		`- current === unknownOption_)) {`
	`629`	`+ current === unknownOption_ \|\|`
	`630`	`+ emptyOption_ && emptyOption_.nodeType === NODE_TYPE_COMMENT)) {`
	`631`	`+ // Empty options might have directives that transclude`
	`632`	`+ // and insert comments (e.g. ngIf)`
`630`	`633`	`current = current.nextSibling;`
`631`	`634`	`}`
`632`	`635`	`}`