WIP: move getViewValue function

Author: jeffbcross

src/ng/directive/select.js

@@ -383,64 +383,6 @@ 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,
@@ -509,6 +451,62 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
           return selectedSet;
         }
 
+        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;
+        }
+
 
         function scheduleRendering() {
           if (!renderScheduled) {