ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-31 08:25:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "[Time Conductor] Validate numeric date-time fields"

Browse Source 
This reverts commit 07c407edea24825b15001ecad96026ecdf6d53ad.
This commit is contained in:
Victor Woeltjen 2016-01-11 15:23:21 -08:00
parent 99556ed6a5
commit e6d0537e5e
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/templates/controls/datetime-field.html
View File

@ -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"

19
platform/commonUI/general/src/controllers/DateTimeFieldController.js
View File

@ -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;