ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-08 03:44:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #299 from nasa/open297

Browse Source 
[Time Conductor] Fix date picker toggles
This commit is contained in:
akhenry 2015-11-12 16:52:35 -08:00
commit 2b2ac0b0d9
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,10 @@
</input>
<a class="ui-symbol icon icon-calendar"
ng-if="structure.format === 'utc' || !structure.format"
ng-click="pickerActive = !pickerActive">
ng-click="picker.active = !picker.active">
</a>
<mct-popup ng-if="pickerActive">
<div mct-click-elsewhere="pickerActive = false">
<mct-popup ng-if="picker.active">
<div mct-click-elsewhere="picker.active = false">
<mct-control key="'datetime-picker'"
ng-model="ngModel"
field="field"

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

@ -69,9 +69,12 @@ define(
updateFromModel($scope.ngModel[$scope.field]);
}
$scope.picker = { active: false };
$scope.$watch('structure.format', setFormat);
$scope.$watch('ngModel[field]', updateFromModel);
$scope.$watch('textValue', updateFromView);
}
return DateTimeFieldController;

4
platform/commonUI/general/src/directives/MCTPopup.js
View File

@ -51,6 +51,10 @@ define(
position = [ rect.left, rect.top ],
popup = popupService.display(div, position);
// TODO: Handle in CSS;
// https://github.com/nasa/openmctweb/issues/298
div.css('z-index', 75);
transclude(function (clone) {
div.append(clone);
});

4
platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
View File

@ -91,6 +91,10 @@ define(
expect(mockScope.textValue).toEqual("1977-05-25 17:30:00");
});
it("exposes toggle state for date-time picker", function () {
expect(mockScope.picker.active).toBe(false);
});
describe("when user input is invalid", function () {
var newText, oldValue;