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

[Timeline] Disambiguate datetime control

Browse Source 
Timeline uses a custom date-time control on creation;
use a distinct key for this to avoid a naming collision
with platform's datetime. Addresses abnormal behavior
identified in nasa/openmctweb#208
This commit is contained in:
Victor Woeltjen 2015-11-20 17:26:43 -08:00
parent fd3059b380
commit 0635e7c38e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/features/timeline/bundle.json
View File

@ -57,7 +57,7 @@
"properties": [ "properties": [
{ {
"name": "Start date/time", "name": "Start date/time",
"control": "datetime", "control": "timeline-datetime",
"required": true, "required": true,
"property": [ "start" ], "property": [ "start" ],
"options": [ "SET" ] "options": [ "SET" ]
@ -83,7 +83,7 @@
"properties": [ "properties": [
{ {
"name": "Start date/time", "name": "Start date/time",
"control": "datetime", "control": "timeline-datetime",
"required": true, "required": true,
"property": [ "start" ], "property": [ "start" ],
"options": [ "SET" ] "options": [ "SET" ]
@ -271,7 +271,7 @@
], ],
"controls": [ "controls": [
{ {
"key": "datetime", "key": "timeline-datetime",
"templateUrl": "templates/controls/datetime.html" "templateUrl": "templates/controls/datetime.html"
}, },
{ {