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] Try to rewrite datetime picker as control

Browse Source
This commit is contained in:
Victor Woeltjen
2015-09-15 18:34:27 -07:00
parent 6c497f3c36
commit 9a78b63065
6 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/commonUI/general/src/controllers/DateTimePickerController.js
View File

@ -136,7 +136,7 @@ define(
minute: $scope.time.minutes,
second: $scope.time.seconds
});
$scope.ngModel = m.valueOf();
$scope.ngModel[$scope.field] = m.valueOf();
}
$scope.isSelectable = function (cell) {
@ -189,10 +189,11 @@ define(
updateScopeForMonth();
// Ensure some useful default
$scope.ngModel = $scope.ngModel === undefined ?
now() : $scope.ngModel;
$scope.ngModel[$scope.field] =
$scope.ngModel[$scope.field] === undefined ?
now() : $scope.ngModel[$scope.field];
$scope.$watch('ngModel', updateFromModel);
$scope.$watch('ngModel[field]', updateFromModel);
$scope.$watchCollection('date', updateFromView);
$scope.$watchCollection('time', updateFromView);
}