diff --git a/example/localTimeSystem/src/LocalTimeSystem.js b/example/localTimeSystem/src/LocalTimeSystem.js index dd62fe15180..883504e4483 100644 --- 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 index 06750459c97..26ec7d3e9ce 100644 --- 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 index 8385a170690..b05b4c6fbe8 100644 --- 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 index a968f1ca113..9338180ce1e 100644 --- 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} }