ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 13:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Time Conductor] Tweak position, appearance

Browse Source 
...of datetime picker popups. WTD-1515
This commit is contained in:
Victor Woeltjen 2015-09-15 18:51:44 -07:00
parent 70d9587c9b
commit e34fe1a289
2 changed files with 3 additions and 3 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 ng-controller="ToggleController as t"> <span ng-controller="ToggleController as t">
<a class="ui-symbol" ng-click="t.toggle()">p</a> <a class="ui-symbol" ng-click="t.toggle()">p</a>
<mct-popup ng-if="t.isActive()"> <mct-popup ng-if="t.isActive()">
<div style="background: #555;" <div style="background: #222;"
mct-click-elsewhere="t.setState(false)"> mct-click-elsewhere="t.setState(false)">
<mct-control key="'datetime-picker'" <mct-control key="'datetime-picker'"
ng-model="ngModel.outer" ng-model="ngModel.outer"
@ -41,7 +41,7 @@
<span ng-controller="ToggleController as t2"> <span ng-controller="ToggleController as t2">
<a class="ui-symbol" ng-click="t2.toggle()">p</a> <a class="ui-symbol" ng-click="t2.toggle()">p</a>
<mct-popup ng-if="t2.isActive()"> <mct-popup ng-if="t2.isActive()">
<div style="background: #555;" <div style="background: #222;"
mct-click-elsewhere="t2.setState(false)"> mct-click-elsewhere="t2.setState(false)">
<mct-control key="'datetime-picker'" <mct-control key="'datetime-picker'"
ng-model="ngModel.outer" ng-model="ngModel.outer"

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

@ -32,7 +32,7 @@ define(
var body = $document.find('body'), var body = $document.find('body'),
popup = $compile(TEMPLATE)(scope), popup = $compile(TEMPLATE)(scope),
winDim = [$window.innerWidth, $window.innerHeight], winDim = [$window.innerWidth, $window.innerHeight],
rect = element[0].getBoundingClientRect(), rect = element.parent()[0].getBoundingClientRect(),
position = [ rect.left, rect.top ], position = [ rect.left, rect.top ],
isLeft = position[0] <= (winDim[0] / 2), isLeft = position[0] <= (winDim[0] / 2),
isTop = position[1] <= (winDim[1] / 2); isTop = position[1] <= (winDim[1] / 2);