wip: simplify select

Author: tbosch

src/ng/directive/select.js

@@ -369,25 +369,17 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                 collection = valuesFn(scope) || [],
                 locals = {},
                 key, value, optionElement, index, groupIndex, length, groupLength, trackIndex;
-
+            var selectedKeys = selectElement.val();
+            var viewValue;
             if (multiple) {
-              value = [];
-              for (groupIndex = 0, groupLength = optionGroupsCache.length;
-                   groupIndex < groupLength;
-                   groupIndex++) {
-                // list of options for that group. (first item has the parent)
-                optionGroup = optionGroupsCache[groupIndex];
-
-                for(index = 1, length = optionGroup.length; index < length; index++) {
-                  if ((optionElement = optionGroup[index].element)[0].selected) {
-                    value.push(getViewValue(optionElement, locals, collection));
-                  }
-                }
-              }
+              viewValue = [];
+              forEach(selectedKeys, function(selectedKey) {
+                viewValue.push(getViewValue(selectedKey, collection));
+              });
             } else {
-              value = getViewValue(selectElement, locals, collection);
+              viewValue = getViewValue(selectedKeys, collection);
             }
-            ctrl.$setViewValue(value);
+            ctrl.$setViewValue(viewValue);
             render();
           });
         });
@@ -431,56 +423,24 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
           return selectedSet;
         }
 
-        function getViewValue (el, locals, collection) {
-          var key = el.val();
-          var value;
-          var calculateViewValue;
-
-          if (selectAsFn || trackFn) {
-            calculateViewValue = function () {
-              var getterFn = selectAsFn || trackFn;
-              var wrappedCollectionValue = {};
-              wrappedCollectionValue[valueName] = collection[key];
-              wrappedCollectionValue[keyName] = key;
-
-              for (var i in collection) {
-                if (collection.hasOwnProperty(i)) {
-                  locals[valueName] = collection[i];
-                  if (keyName) locals[keyName] = i;
-                  if (getterFn(scope, locals) ==
-                      getterFn(scope, wrappedCollectionValue)) {
-                    /*
-                     * trackBy should not be used for final calculation, because it doesn't
-                     * necessarily return the expected value.
-                     */
-                    return (selectAsFn||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;
+        function getViewValue(key, collection) {
+          if (key === '?') {
+            return undefined;
+          } else if (key === '') {
+            return null;
           } else {
-            value = calculateViewValue();
+            var viewValueFn = selectAsFn ? selectAsFn : valueFn;
+            return callExpression(viewValueFn, key, collection);
           }
+        }
 
-          return value;
+        // TODO: Use this method everywhere
+        function callExpression(exprFn, key, collection) {
+          // TODO: keep this as a central object, no need to recreate this
+          var locals = {};
+          locals[valueName] = collection[key];
+          if (keyName) locals[keyName] = key;
+          return exprFn(scope, locals);
         }
 
         function isSelected(viewValue, locals, selectedSet) {