From e6d0537e5ee15be2bb79aaf6a30aa01d58d6bac6 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Mon, 11 Jan 2016 15:23:21 -0800 Subject: [PATCH] Revert "[Time Conductor] Validate numeric date-time fields" This reverts commit 07c407edea24825b15001ecad96026ecdf6d53ad. --- .../templates/controls/datetime-field.html | 2 +- .../controllers/DateTimeFieldController.js | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html index 187bac6dd2..e9b394c530 100644 --- a/platform/commonUI/general/res/templates/controls/datetime-field.html +++ b/platform/commonUI/general/res/templates/controls/datetime-field.html @@ -24,7 +24,7 @@ <input type="text" ng-model="textValue" ng-blur="restoreTextValue(); ngBlur()" - ng-class="{ error: textInvalid, test: valueInvalid }"> + ng-class="{ error: textInvalid }"> </input> <a class="ui-symbol icon icon-calendar" ng-if="structure.format === 'utc' || !structure.format" diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js index fc90852d3d..ef0827e515 100644 --- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js +++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js @@ -26,10 +26,6 @@ define( function () { 'use strict'; - function ACCEPT() { - return true; - } - /** * Controller to support the date-time entry field. * @@ -48,8 +44,7 @@ define( * format has been otherwise specified */ function DateTimeFieldController($scope, formatService, defaultFormat) { - var formatter = formatService.getFormat(defaultFormat), - validate = ACCEPT; + var formatter = formatService.getFormat(defaultFormat); function updateFromModel(value) { // Only reformat if the value is different from user @@ -64,12 +59,10 @@ define( } function updateFromView(textValue) { - var newValue; $scope.textInvalid = !formatter.validate(textValue); if (!$scope.textInvalid) { - newValue = formatter.parse(textValue); - $scope.valueInvalid = !validate(newValue); - $scope.ngModel[$scope.field] = newValue; + $scope.ngModel[$scope.field] = + formatter.parse(textValue); $scope.lastValidValue = $scope.textValue; } } @@ -89,10 +82,6 @@ define( updateFromModel($scope.ngModel[$scope.field]); } - function setValidator(newValidator) { - validate = newValidator || ACCEPT; - } - function restoreTextValue() { $scope.textValue = $scope.lastValidValue; updateFromView($scope.textValue); @@ -106,7 +95,7 @@ define( $scope.$watch('ngModel[field]', updateFromModel); $scope.$watch('pickerModel.value', updateFromPicker); $scope.$watch('textValue', updateFromView); - $scope.$watch('structure.validate', setValidator); + } return DateTimeFieldController;