From 1ef09ffbdd1bfadc39f90f8cf3e5a6a517ff5967 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed, 25 Nov 2015 11:12:41 -0800
Subject: [PATCH] [Time Conductor] Restore last valid values

Restore last valid values on blur, in a date-time entry field.
---
 .../general/res/templates/controls/datetime-field.html   | 2 +-
 .../general/src/controllers/DateTimeFieldController.js   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html
index 79e326faf4..51fbdc636d 100644
--- a/platform/commonUI/general/res/templates/controls/datetime-field.html
+++ b/platform/commonUI/general/res/templates/controls/datetime-field.html
@@ -2,7 +2,7 @@
       ng-controller="DateTimeFieldController">
     <input type="text"
            ng-model="textValue"
-           ng-blur="structure.submit()"
+           ng-blur="restoreValue(); structure.submit()"
            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 325a112e13..bc932a7563 100644
--- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js
+++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
@@ -53,6 +53,7 @@ define(
                         formatter.parse($scope.textValue) !== value) {
                     $scope.textValue = formatter.format(value);
                     $scope.textInvalid = false;
+                    $scope.lastValidValue = $scope.textValue;
                 }
             }
 
@@ -61,6 +62,7 @@ define(
                 if (!$scope.textInvalid) {
                     $scope.ngModel[$scope.field] =
                         formatter.parse(textValue);
+                    $scope.lastValidValue = $scope.textValue;
                 }
             }
 
@@ -69,6 +71,13 @@ define(
                 updateFromModel($scope.ngModel[$scope.field]);
             }
 
+            function restoreValue() {
+                $scope.textValue = $scope.lastValidValue;
+                updateFromView($scope.textValue);
+            }
+
+            $scope.restoreValue = restoreValue;
+
             $scope.picker = { active: false };
 
             $scope.$watch('structure.format', setFormat);