ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 14:48:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Time Conductor] Fixing bugs found in smoke testing. Fixes #933

Browse Source
This commit is contained in:
Henry
2016-09-09 16:39:21 -07:00
parent fbab890081
commit e639e056ba
13 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.js
View File

@ -91,10 +91,14 @@ define([
'./platform/features/pages/bundle',
'./platform/features/plot/bundle',
'./platform/features/timeline/bundle',
// Old time conductor
//'./platform/features/conductor/bundle',
'./platform/features/conductor-v2/conductor/bundle',
'./platform/features/conductor-v2/compatibility/bundle',
'./platform/features/conductor-v2/utcTimeSystem/bundle',
// New time conductor
//'./platform/features/conductor-v2/conductor/bundle',
//'./platform/features/conductor-v2/compatibility/bundle',
//'./platform/features/conductor-v2/utcTimeSystem/bundle',
'./platform/features/table/bundle',
'./platform/forms/bundle',
'./platform/identity/bundle',
@ -106,7 +110,7 @@ define([
'./platform/search/bundle',
'./platform/status/bundle',
'./platform/commonUI/regions/bundle'
//'./example/localTimeSystem/bundle'
], function (Main, legacyRegistry) {
return {