Merge branch 'open1077' into 1435-integration

platform/features/conductor/utcTimeSystem/bundle.js

@@ -22,7 +22,7 @@
 
 define([
     "./src/UTCTimeSystem",
-    'legacyRegistry'
+    "legacyRegistry"
 ], function (
     UTCTimeSystem,
     legacyRegistry
@@ -34,7 +34,23 @@ define([
                     "implementation": UTCTimeSystem,
                     "depends": ["$timeout"]
                 }
+            ],
+            "runs": [
+                {
+                    "implementation": function (openmct, $timeout) {
+                        // Temporary shim to initialize the time conductor to
+                        // something
+                        if (!openmct.conductor.timeSystem()) {
+                            var utcTimeSystem = new UTCTimeSystem($timeout);
+
+                            openmct.conductor.timeSystem(utcTimeSystem, utcTimeSystem.defaults().bounds);
+                        }
+                    },
+                    "depends": ["openmct", "$timeout"],
+                    "priority": "fallback"
+                }
             ]
         }
     });
+
 });

platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js

@@ -25,7 +25,7 @@ define([
     '../../core/src/timeSystems/LocalClock'
 ], function (TimeSystem, LocalClock) {
     var FIFTEEN_MINUTES = 15 * 60 * 1000,
-        DEFAULT_PERIOD = 1000;
+        DEFAULT_PERIOD = 100;
 
     /**
      * This time system supports UTC dates and provides a ticking clock source.