ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-16 14:18:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Time Conductor] Remove obsolete code

Browse Source 
Remove code related to handling text input from TimeRangeController;
moved into DateTimeFieldController.
This commit is contained in:
Victor Woeltjen
2015-10-27 13:07:58 -07:00
parent 18cdaf1b53
commit 9dce3a04cc
1 changed files with 7 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
platform/commonUI/general/src/controllers/TimeRangeController.js
View File

@ -102,42 +102,15 @@ define(
return { start: bounds.start, end: bounds.end }; return { start: bounds.start, end: bounds.end };
} }
function updateBoundsTextForProperty(ngModel, property) {
try {
if (!$scope.boundsModel[property] ||
parseTimestamp($scope.boundsModel[property]) !==
ngModel.outer[property]) {
$scope.boundsModel[property] =
formatTimestamp(ngModel.outer[property]);
// Never want to flag machine-generated text
// as invalid here.
$scope.boundsModel[property + 'Valid'] = true;
}
} catch (e) {
// User-entered text is invalid, so leave it be
// until they fix it.
}
}
function updateBoundsText(ngModel) {
updateBoundsTextForProperty(ngModel, 'start');
updateBoundsTextForProperty(ngModel, 'end');
}
function updateViewFromModel(ngModel) { function updateViewFromModel(ngModel) {
ngModel = ngModel || {}; ngModel = ngModel || {};
ngModel.outer = ngModel.outer || defaultBounds(); ngModel.outer = ngModel.outer || defaultBounds();
ngModel.inner = ngModel.inner || copyBounds(ngModel.outer); ngModel.inner = ngModel.inner || copyBounds(ngModel.outer);
// First, dates for the date pickers for outer bounds
updateBoundsText(ngModel);
// Then various updates for the inner span
updateViewForInnerSpanFromModel(ngModel);
// Stick it back is scope (in case we just set defaults) // Stick it back is scope (in case we just set defaults)
$scope.ngModel = ngModel; $scope.ngModel = ngModel;
updateViewForInnerSpanFromModel(ngModel);
updateTicks(); updateTicks();
} }
@ -157,7 +130,8 @@ define(
} }
function toMillis(pixels) { function toMillis(pixels) {
var span = $scope.ngModel.outer.end - $scope.ngModel.outer.start; var span =
$scope.ngModel.outer.end - $scope.ngModel.outer.start;
return (pixels / $scope.spanWidth) * span; return (pixels / $scope.spanWidth) * span;
} }
@ -245,47 +219,12 @@ define(
updateTicks(); updateTicks();
} }
function updateStartFromText(value) {
try {
updateOuterStart(parseTimestamp(value));
updateBoundsTextForProperty($scope.ngModel, 'end');
$scope.boundsModel.startValid = true;
} catch (e) {
$scope.boundsModel.startValid = false;
return;
}
}
function updateEndFromText(value) {
try {
updateOuterEnd(parseTimestamp(value));
updateBoundsTextForProperty($scope.ngModel, 'start');
$scope.boundsModel.endValid = true;
} catch (e) {
$scope.boundsModel.endValid = false;
return;
}
}
function updateFormat(key) { function updateFormat(key) {
formatter = formatService.getFormat(key) || formatter = formatService.getFormat(key) ||
formatService.getFormat(DEFAULT_FORMAT); formatService.getFormat(DEFAULT_FORMAT);
// Assume that start/end are still valid, but clear updateViewForInnerSpanFromModel($scope.ngModel);
// the displayed text for bounds, since this will updateTicks();
// now be formatted differently.
$scope.boundsModel = {};
updateViewFromModel($scope.ngModel);
}
function updateStartFromPicker(value) {
updateOuterStart(value);
updateBoundsText($scope.ngModel);
}
function updateEndFromPicker(value) {
updateOuterEnd(value);
updateBoundsText($scope.ngModel);
} }
$scope.startLeftDrag = startLeftDrag; $scope.startLeftDrag = startLeftDrag;
@ -295,19 +234,15 @@ define(
$scope.rightDrag = rightDrag; $scope.rightDrag = rightDrag;
$scope.middleDrag = middleDrag; $scope.middleDrag = middleDrag;
$scope.state = false;
$scope.ticks = []; $scope.ticks = [];
$scope.boundsModel = {};
// Initialize scope to defaults // Initialize scope to defaults
updateViewFromModel($scope.ngModel); updateViewFromModel($scope.ngModel);
$scope.$watchCollection("ngModel", updateViewFromModel); $scope.$watchCollection("ngModel", updateViewFromModel);
$scope.$watch("spanWidth", updateSpanWidth); $scope.$watch("spanWidth", updateSpanWidth);
$scope.$watch("ngModel.outer.start", updateStartFromPicker); $scope.$watch("ngModel.outer.start", updateOuterStart);
$scope.$watch("ngModel.outer.end", updateEndFromPicker); $scope.$watch("ngModel.outer.end", updateOuterEnd);
$scope.$watch("boundsModel.start", updateStartFromText);
$scope.$watch("boundsModel.end", updateEndFromText);
$scope.$watch("parameters.format", updateFormat); $scope.$watch("parameters.format", updateFormat);
} }