From f0e1eb06aa074cf5846b2c9126d374d71115f046 Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <g.kalpakas@hotmail.com>
Date: Thu, 28 Jan 2016 20:47:36 +0200
Subject: [PATCH 1/3] fix(select): handle corner case of adding options via a
 custom directive

Under specific circumstances (e.g. adding options via a directive with `replace: true` and a
structural directive in its template), an error occurred when trying to call `hasAttribute()` on a
comment node (which doesn't support that method).
This commit fixes it by first checking if `hasAttribute()` is available.

Fixes #13874
---
 src/ng/directive/select.js      |  5 +++--
 test/ng/directive/selectSpec.js | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index fdef4d779245..62cfd085c317 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -6,8 +6,9 @@ function chromeHack(optionElement) {
   // Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
   // Adding an <option selected="selected"> element to a <select required="required"> should
   // automatically select the new element
-  if (optionElement[0].hasAttribute('selected')) {
-    optionElement[0].selected = true;
+  var optionNode = optionElement[0];
+  if (optionNode.hasAttribute && optionNode.hasAttribute('selected')) {
+    optionNode.selected = true;
   }
 }
 
diff --git a/test/ng/directive/selectSpec.js b/test/ng/directive/selectSpec.js
index 23a961611cce..8f8c6bb36752 100644
--- a/test/ng/directive/selectSpec.js
+++ b/test/ng/directive/selectSpec.js
@@ -44,6 +44,17 @@ describe('select', function() {
         }
       };
     });
+
+    $compileProvider.directive('myOptions', function() {
+      return {
+        scope: {myOptions: '='},
+        replace: true,
+        template:
+            '<option value="{{ ::option.value }}" ng-repeat="option in ::myOptions">' +
+              '{{ ::options.label }}' +
+            '</option>'
+      };
+    });
   }));
 
   beforeEach(inject(function($rootScope, _$compile_) {
@@ -313,7 +324,7 @@ describe('select', function() {
       });
 
 
-    it('should cope with a dynamic empty option added to a static empty option', function() {
+      it('should cope with a dynamic empty option added to a static empty option', function() {
         scope.dynamicOptions = [];
         scope.robot = 'x';
         compile('<select ng-model="robot">' +
@@ -340,7 +351,7 @@ describe('select', function() {
         scope.dynamicOptions = [];
         scope.$digest();
         expect(element).toEqualSelect(['']);
-    });
+      });
 
       it('should select the empty option when model is undefined', function() {
         compile('<select ng-model="robot">' +
@@ -611,6 +622,24 @@ describe('select', function() {
 
     });
 
+
+    it('should not break when adding options via a directive with `replace: true` '
+        + 'and a structural directive in its template',
+      function() {
+        scope.options = [
+          {value: '1', label: 'Option 1'},
+          {value: '2', label: 'Option 2'},
+          {value: '3', label: 'Option 3'}
+        ];
+
+        expect(function() {
+          compile(
+              '<select ng-model="mySelect">' +
+                '<option my-options="options"></option>' +
+              '</select>');
+        }).not.toThrow();
+      }
+    );
   });
 
 

From 359039c03a825c157cf71138204588bc5c6f8abd Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <g.kalpakas@hotmail.com>
Date: Fri, 29 Jan 2016 13:57:44 +0200
Subject: [PATCH 2/3] fixup 1

---
 src/ng/directive/select.js      | 10 +++++-----
 test/ng/directive/selectSpec.js | 12 ++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index 62cfd085c317..ebe8bb1fdc60 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -6,9 +6,8 @@ function chromeHack(optionElement) {
   // Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
   // Adding an <option selected="selected"> element to a <select required="required"> should
   // automatically select the new element
-  var optionNode = optionElement[0];
-  if (optionNode.hasAttribute && optionNode.hasAttribute('selected')) {
-    optionNode.selected = true;
+  if (optionElement[0].hasAttribute('selected')) {
+    optionElement[0].selected = true;
   }
 }
 
@@ -81,6 +80,9 @@ var SelectController =
 
   // Tell the select control that an option, with the given value, has been added
   self.addOption = function(value, element) {
+    // Skip comment nodes, as they only pollute the `optionsMap`
+    if (element.prop('nodeType') === NODE_TYPE_COMMENT) return;
+
     assertNotHasOwnProperty(value, '"option value"');
     if (value === '') {
       self.emptyOption = element;
@@ -453,7 +455,6 @@ var optionDirective = ['$interpolate', function($interpolate) {
     restrict: 'E',
     priority: 100,
     compile: function(element, attr) {
-
       if (isDefined(attr.value)) {
         // If the value attribute is defined, check if it contains an interpolation
         var interpolateValueFn = $interpolate(attr.value, true);
@@ -467,7 +468,6 @@ var optionDirective = ['$interpolate', function($interpolate) {
       }
 
       return function(scope, element, attr) {
-
         // This is an optimization over using ^^ since we don't want to have to search
         // all the way to the root of the DOM for every single option element
         var selectCtrlName = '$selectController',
diff --git a/test/ng/directive/selectSpec.js b/test/ng/directive/selectSpec.js
index 8f8c6bb36752..7749d2a976db 100644
--- a/test/ng/directive/selectSpec.js
+++ b/test/ng/directive/selectSpec.js
@@ -50,8 +50,8 @@ describe('select', function() {
         scope: {myOptions: '='},
         replace: true,
         template:
-            '<option value="{{ ::option.value }}" ng-repeat="option in ::myOptions">' +
-              '{{ ::options.label }}' +
+            '<option value="{{ option.value }}" ng-repeat="option in myOptions">' +
+              '{{ options.label }}' +
             '</option>'
       };
     });
@@ -631,13 +631,9 @@ describe('select', function() {
           {value: '2', label: 'Option 2'},
           {value: '3', label: 'Option 3'}
         ];
+        compile('<select ng-model="mySelect"><option my-options="options"></option></select>');
 
-        expect(function() {
-          compile(
-              '<select ng-model="mySelect">' +
-                '<option my-options="options"></option>' +
-              '</select>');
-        }).not.toThrow();
+        expect(element).toEqualSelect([unknownValue()], '1', '2', '3');
       }
     );
   });

From 4691a8fc9fc987bd33643b628d9cf7025ed74c8a Mon Sep 17 00:00:00 2001
From: Georgios Kalpakas <g.kalpakas@hotmail.com>
Date: Fri, 29 Jan 2016 14:28:58 +0200
Subject: [PATCH 3/3] fixup 2

---
 src/ng/directive/select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index ebe8bb1fdc60..2a5ed5e205f0 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -81,7 +81,7 @@ var SelectController =
   // Tell the select control that an option, with the given value, has been added
   self.addOption = function(value, element) {
     // Skip comment nodes, as they only pollute the `optionsMap`
-    if (element.prop('nodeType') === NODE_TYPE_COMMENT) return;
+    if (element[0].nodeType === NODE_TYPE_COMMENT) return;
 
     assertNotHasOwnProperty(value, '"option value"');
     if (value === '') {