WIP: fix updating viewValue from element's val

Author: jeffbcross

src/ng/directive/select.js

@@ -402,7 +402,14 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                   if ((optionElement = optionGroup[index].element)[0].selected) {
                     key = optionElement.val();
                     if (keyName) locals[keyName] = key;
-                    if (trackFn) {
+                    if (selectAsFn) {
+                      var collectionWithValueName = {};
+                      collectionWithValueName[valueName] = collection[key];
+                      for (i = 0; i < collection.length; i++) {
+                        locals[valueName] = collection[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;
@@ -421,9 +428,21 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
               } else if (key === ''){
                 value = null;
               } else {
-                if (trackFn) {
+                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;

test/ng/directive/selectSpec.js

@@ -1511,11 +1511,9 @@ describe('select', function() {
 
             expect(element.val()).toEqual(['1']);
 
-            dump('triggering!');
             element.val(['0']);
             browserTrigger(element, 'change');
             scope.$digest();
-            dump(element);
 
             expect(scope.selected).toEqual([10]);
           });