WIP: implement getViewValue method to normalize calculation of values

Author: jeffbcross

src/ng/directive/select.js

@@ -383,6 +383,64 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
         // clear contents, we'll add what's needed based on the model
         selectElement.empty();
 
+        function getViewValue (el, scope, locals, collection, multiple) {
+          var key = el.val();
+          var value;
+          var calculateViewValue;
+
+          if (selectAsFn) {
+            calculateViewValue = function () {
+              var collectionWithValueName = {};
+              collectionWithValueName[valueName] = collection[key];
+              collectionWithValueName[keyName] = key;
+
+              for (var i in collection) {
+                if (collection.hasOwnProperty(i)) {
+                  locals[valueName] = collection[i];
+                  if (keyName) locals[keyName] = i;
+                  if (selectAsFn(scope, locals) ==
+                      selectAsFn(scope, collectionWithValueName)) {
+                    return selectAsFn(scope, locals);
+                  }
+                }
+              }
+            };
+          } else if (trackFn) {
+            calculateViewValue = function() {
+              for (var trackIndex = 0; trackIndex < collection.length; trackIndex++) {
+                locals[valueName] = collection[trackIndex];
+                if (trackFn(scope, locals) == key) {
+                  return valueFn(scope, locals);
+                }
+              }
+            };
+          }
+          else {
+            calculateViewValue = function() {
+              locals[valueName] = collection[key];
+              if (keyName) locals[keyName] = key;
+              return valueFn(scope, locals);
+            };
+          }
+
+          if (multiple) {
+            if (keyName) locals[keyName] = key;
+            calculateViewValue();
+
+            return (selectAsFn || valueFn)(scope, locals);
+          }
+
+          if (key == '?') {
+            value = undefined;
+          } else if (key === ''){
+            value = null;
+          } else {
+            value = calculateViewValue();
+          }
+
+          return value;
+        }
+
         selectElement.on('change', function() {
           scope.$apply(function() {
             var optionGroup,
@@ -400,67 +458,12 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
 
                 for(index = 1, length = optionGroup.length; index < length; index++) {
                   if ((optionElement = optionGroup[index].element)[0].selected) {
-                    key = optionElement.val();
-                    if (keyName) locals[keyName] = key;
-                    if (selectAsFn) {
-                      var collectionWithValueName = {};
-                      collectionWithValueName[valueName] = collection[key];
-                      collectionWithValueName[keyName] = key;
-
-                      for (i in collection) {
-                        if (collection.hasOwnProperty(i)) {
-                          locals[valueName] = collection[i];
-                          locals[keyName] = i;
-                          if (selectAsFn(scope, locals) ==
-                              selectAsFn(scope, collectionWithValueName)) break;
-                        }
-
-                      }
-                    } else if (trackFn) {
-                      for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                        locals[valueName] = collection[trackIndex];
-                        if (trackFn(scope, locals) == key) break;
-                      }
-                    } else {
-                      locals[valueName] = collection[key];
-                    }
-                    value.push((selectAsFn || valueFn)(scope, locals));
+                    value.push(getViewValue(optionElement, scope, locals, collection, true))
                   }
                 }
               }
             } else {
-              key = selectElement.val();
-              if (key == '?') {
-                value = undefined;
-              } else if (key === ''){
-                value = null;
-              } else {
-                if (selectAsFn) {
-                  for (i = 0; i < collection.length; i++) {
-                    locals[valueName] = collection[i];
-                    var collectionWithValueName = {};
-                    collectionWithValueName[valueName] = collection[key];
-
-                    if (selectAsFn(scope, locals) === selectAsFn(scope, collectionWithValueName)) {
-                      value = selectAsFn(scope, locals);
-                      break;
-                    }
-                  }
-                } else if (trackFn) {
-                  for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                    locals[valueName] = collection[trackIndex];
-
-                    if (trackFn(scope, locals) == key) {
-                      value = valueFn(scope, locals);
-                      break;
-                    }
-                  }
-                } else {
-                  locals[valueName] = collection[key];
-                  if (keyName) locals[keyName] = key;
-                  value = valueFn(scope, locals);
-                }
-              }
+              value = getViewValue(selectElement, scope, locals, collection);
             }
             ctrl.$setViewValue(value);
             render();