ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-31 08:25:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Time Conductor] Switched conductor to mct-include rather than mct-representation to avoid warnings

Browse Source
This commit is contained in:
Henry 2016-09-07 14:29:21 -07:00
parent d37dd52ee1
commit fbab890081
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/browse/res/templates/browse-object.html
View File

@ -59,8 +59,9 @@
</mct-representation>
</div>
</div>
<mct-representation mct-object="domainObject"
<mct-include key="'time-conductor'" class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder"></mct-include>
<!-- <mct-representation mct-object="domainObject"
key="'time-conductor'"
class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder">
</mct-representation>
</mct-representation> -->
</div>

6
platform/features/conductor-v2/conductor/bundle.js
View File

@ -91,6 +91,12 @@ define([
"theme": "snow"
}
],
"templates": [
{
"key": "time-conductor",
"template": timeConductorTemplate
}
],
"representations": [
{
"key": "time-conductor",

2
platform/features/conductor-v2/conductor/res/templates/time-conductor.html
View File

@ -106,4 +106,4 @@
</div>
</div>
</div>
</div>