[TCv2] different defaults by mode

nasa · Aug 4, 2016 · 9a72c96 · 9a72c96
1 parent f4e1879
commit 9a72c96
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/example/localTimeSystem/src/LocalTimeSystem.js b/example/localTimeSystem/src/LocalTimeSystem.js
@@ -70,6 +70,14 @@ define([
             {
                 key: 'local-default',
                 name: 'Local 12 hour time system defaults',
+                mode: 'fixed',
+                deltas: {start: FIFTEEN_MINUTES, end: 0},
+                bounds: {start: now - FIFTEEN_MINUTES, end: now}
+            },
+            {
+                key: 'local-default',
+                name: 'Local 12 hour time system defaults',
+                mode: 'follow',
                 deltas: {start: FIFTEEN_MINUTES, end: 0},
                 bounds: {start: now - FIFTEEN_MINUTES, end: now}
             }

diff --git a/platform/features/conductor-v2/conductor/src/ui/modes/FixedMode.js b/platform/features/conductor-v2/conductor/src/ui/modes/FixedMode.js
@@ -53,7 +53,9 @@ define(
             TimeConductorMode.prototype.selectedTimeSystem.apply(this, arguments);
 
             if (timeSystem) {
-                var defaults = timeSystem.defaults()[0];
+                var defaults = timeSystem.defaults().filter(function (d) {
+                    return d.mode === 'fixed';
+                })[0];
 
                 var bounds = {
                     start: defaults.bounds.start,

diff --git a/platform/features/conductor-v2/conductor/src/ui/modes/FollowMode.js b/platform/features/conductor-v2/conductor/src/ui/modes/FollowMode.js
@@ -87,7 +87,9 @@ define(
                     this.tickSourceUnlisten();
                 }
 
-                var defaults = timeSystem.defaults()[0];
+                var defaults = timeSystem.defaults().filter(function (d) {
+                    return d.mode === 'follow';
+                })[0];
 
                 if (arguments.length > 0) {
                     var bounds = {

diff --git a/platform/features/conductor-v2/utcTimeSystem/src/UTCTimeSystem.js b/platform/features/conductor-v2/utcTimeSystem/src/UTCTimeSystem.js
@@ -70,6 +70,14 @@ define([
             {
                 key: 'utc-default',
                 name: 'UTC time system defaults',
+                mode: 'follow',
+                deltas: {start: FIFTEEN_MINUTES, end: 0},
+                bounds: {start: now - FIFTEEN_MINUTES, end: now}
+            },
+            {
+                key: 'utc-default',
+                name: 'UTC time system defaults',
+                mode: 'fixed',
                 deltas: {start: FIFTEEN_MINUTES, end: 0},
                 bounds: {start: now - FIFTEEN_MINUTES, end: now}
             }