simplify

Author: Narretz

src/ng/directive/ngOptions.js

@@ -592,6 +592,12 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
 
       // ------------------------------------------------------------------ //
 
+      function addOptionElement(option, parent) {
+        var optionElement = optionTemplate.cloneNode(false);
+        parent.appendChild(optionElement);
+        updateOptionElement(option, optionElement);
+      }
+
 
       function updateOptionElement(option, element) {
         option.element = element;
@@ -612,11 +618,12 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
         var previousValue = options && selectCtrl.readValue();
 
         // We must remove all current options, but cannot simply set innerHTML = null
-        // since the providedOption might have an ngIf on it that inserts comments which we must
-        // preserve
-        // Instead iterate over the current option elements and remove them or their optgroup
+        // since the providedEmptyOption might have an ngIf on it that inserts comments which we
+        // must preserve.
+        // Instead, iterate over the current option elements and remove them or their optgroup
         // parents
         if (options) {
+
           for (var i = options.items.length - 1; i >= 0; i--) {
             var option = options.items[i];
             if (option.group) {
@@ -629,26 +636,24 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
 
         options = ngOptions.getOptions();
 
-        var groupMap = {};
+        var groupElementMap = {};
         var listFragment = $document[0].createDocumentFragment();
 
         // Ensure that the empty option is always there if it was explicitly provided
         if (providedEmptyOption) {
           selectElement.prepend(emptyOption);
         }
 
-        options.items.forEach(function updateOption(option) {
-          var group;
+        options.items.forEach(function addOption(option) {
           var groupElement;
-          var optionElement;
 
           if (isDefined(option.group)) {
 
             // This option is to live in a group
             // See if we have already created this group
-            group = groupMap[option.group];
+            groupElement = groupElementMap[option.group];
 
-            if (!group) {
+            if (!groupElement) {
 
               groupElement = optGroupTemplate.cloneNode(false);
               listFragment.appendChild(groupElement);
@@ -657,21 +662,15 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
               groupElement.label = option.group;
 
               // Store it for use later
-              group = groupMap[option.group] = {
-                groupElement: groupElement
-              };
-
+              groupElementMap[option.group] = groupElement;
             }
 
-            optionElement = optionTemplate.cloneNode(false);
-            group.groupElement.appendChild(optionElement);
-            updateOptionElement(option, optionElement);
+            addOptionElement(option, groupElement);
 
           } else {
 
-            optionElement = optionTemplate.cloneNode(false);
-            listFragment.appendChild(optionElement);
-            updateOptionElement(option, optionElement);
+            // This option is not in a group
+            addOptionElement(option, listFragment);
           }
         });