ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-10 19:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Time Conductor] Update model on submit/blur

Browse Source
This commit is contained in:
Victor Woeltjen 2015-11-25 11:09:11 -08:00
parent 87a51a9eb3
commit 976ecce075
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/general/res/templates/controls/time-controller.html
View File

@ -26,7 +26,7 @@
<span class="l-time-range-input"> <span class="l-time-range-input">
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ format: parameters.format, submit: updateBoundsFromForm }" structure="{ format: parameters.format, submit: updateBoundsFromForm }"
ng-model="ngModel.outer" ng-model="formModel"
field="'start'" field="'start'"
class="time-range-start"> class="time-range-start">
</mct-control> </mct-control>
@ -37,7 +37,7 @@
<span class="l-time-range-input" ng-controller="ToggleController as t2"> <span class="l-time-range-input" ng-controller="ToggleController as t2">
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ format: parameters.format, submit: updateBoundsFromForm }" structure="{ format: parameters.format, submit: updateBoundsFromForm }"
ng-model="ngModel.outer" ng-model="formModel"
field="'end'" field="'end'"
class="time-range-end"> class="time-range-end">
</mct-control>&nbsp; </mct-control>&nbsp;

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

@ -175,6 +175,13 @@ define(
updateViewFromModel($scope.ngModel); updateViewFromModel($scope.ngModel);
} }
function updateFormModel() {
$scope.formModel = {
start: (($scope.ngModel || {}).outer || {}).start,
end: (($scope.ngModel || {}).outer || {}).end
};
}
function updateOuterStart(t) { function updateOuterStart(t) {
var ngModel = $scope.ngModel; var ngModel = $scope.ngModel;
@ -192,6 +199,7 @@ define(
ngModel.inner.end ngModel.inner.end
); );
updateFormModel();
updateViewForInnerSpanFromModel(ngModel); updateViewForInnerSpanFromModel(ngModel);
updateTicks(); updateTicks();
} }
@ -213,6 +221,7 @@ define(
ngModel.inner.start ngModel.inner.start
); );
updateFormModel();
updateViewForInnerSpanFromModel(ngModel); updateViewForInnerSpanFromModel(ngModel);
updateTicks(); updateTicks();
} }
@ -223,6 +232,14 @@ define(
updateTicks(); updateTicks();
} }
function updateBoundsFromForm() {
$scope.ngModel = $scope.ngModel || {};
$scope.ngModel.outer = {
start: $scope.formModel.start,
end: $scope.formModel.end
};
}
$scope.startLeftDrag = startLeftDrag; $scope.startLeftDrag = startLeftDrag;
$scope.startRightDrag = startRightDrag; $scope.startRightDrag = startRightDrag;
$scope.startMiddleDrag = startMiddleDrag; $scope.startMiddleDrag = startMiddleDrag;
@ -230,14 +247,13 @@ define(
$scope.rightDrag = rightDrag; $scope.rightDrag = rightDrag;
$scope.middleDrag = middleDrag; $scope.middleDrag = middleDrag;
$scope.updateBoundsFromForm = function () { $scope.updateBoundsFromForm = updateBoundsFromForm;
// TODO: update outer bounds
};
$scope.ticks = []; $scope.ticks = [];
// Initialize scope to defaults // Initialize scope to defaults
updateViewFromModel($scope.ngModel); updateViewFromModel($scope.ngModel);
updateFormModel();
$scope.$watchCollection("ngModel", updateViewFromModel); $scope.$watchCollection("ngModel", updateViewFromModel);
$scope.$watch("spanWidth", updateSpanWidth); $scope.$watch("spanWidth", updateSpanWidth);