From 248bc68f0d30d541f9ea590e54c6cdf847420cc3 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 27 Nov 2015 14:23:25 -0800
Subject: [PATCH] [Time Conductor] Test restoration of old values

...and clarify name of the function in scope which does this.
---
 .../general/res/templates/controls/datetime-field.html    | 2 +-
 .../general/src/controllers/DateTimeFieldController.js    | 4 ++--
 .../test/controllers/DateTimeFieldControllerSpec.js       | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html
index 55f3cd1745..e9b394c530 100644
--- a/platform/commonUI/general/res/templates/controls/datetime-field.html
+++ b/platform/commonUI/general/res/templates/controls/datetime-field.html
@@ -23,7 +23,7 @@
       ng-controller="DateTimeFieldController">
     <input type="text"
            ng-model="textValue"
-           ng-blur="restoreValue(); ngBlur()"
+           ng-blur="restoreTextValue(); ngBlur()"
            ng-class="{ error: textInvalid }">
     </input>
     <a class="ui-symbol icon icon-calendar"
diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
index 313471f21f..ef0827e515 100644
--- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js
+++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
@@ -82,12 +82,12 @@ define(
                 updateFromModel($scope.ngModel[$scope.field]);
             }
 
-            function restoreValue() {
+            function restoreTextValue() {
                 $scope.textValue = $scope.lastValidValue;
                 updateFromView($scope.textValue);
             }
 
-            $scope.restoreValue = restoreValue;
+            $scope.restoreTextValue = restoreTextValue;
 
             $scope.picker = { active: false };
 
diff --git a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
index b737de309a..b677e3f2d1 100644
--- a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
+++ b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
@@ -126,11 +126,12 @@ define(
             });
 
             describe("when user input is invalid", function () {
-                var newText, oldValue;
+                var newText, oldText, oldValue;
 
                 beforeEach(function () {
                     newText = "Not a date";
                     oldValue = mockScope.ngModel.testField;
+                    oldText = mockScope.textValue;
                     mockScope.textValue = newText;
                     fireWatch("textValue", newText);
                 });
@@ -146,6 +147,11 @@ define(
                 it("does not modify user input", function () {
                     expect(mockScope.textValue).toEqual(newText);
                 });
+
+                it("restores valid text values on request", function () {
+                    mockScope.restoreTextValue();
+                    expect(mockScope.textValue).toEqual(oldText);
+                });
             });
 
             it("does not modify valid but irregular user input", function () {