diff --git a/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js b/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js index 422c356512..a933761eac 100644 --- a/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js +++ b/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js @@ -48,7 +48,6 @@ define([ this.fmts = ['utc']; this.sources = [new LocalClock($timeout, DEFAULT_PERIOD)]; - this.defaultValues = undefined; } UTCTimeSystem.prototype = Object.create(TimeSystem.prototype); @@ -65,25 +64,18 @@ define([ return this.sources; }; - UTCTimeSystem.prototype.defaults = function (defaults) { - if (arguments.length > 0) { - this.defaultValues = defaults; - } + UTCTimeSystem.prototype.defaults = function () { + var now = Math.ceil(Date.now() / 1000) * 1000; + var ONE_MINUTE = 60 * 1 * 1000; + var FIFTY_YEARS = 50 * 365 * 24 * 60 * 60 * 1000; - if (this.defaultValues === undefined) { - var now = Math.ceil(Date.now() / 1000) * 1000; - var ONE_MINUTE = 60 * 1 * 1000; - var FIFTY_YEARS = 50 * 365 * 24 * 60 * 60 * 1000; - - this.defaultValues = { - key: 'utc-default', - name: 'UTC time system defaults', - deltas: {start: FIFTEEN_MINUTES, end: 0}, - bounds: {start: now - FIFTEEN_MINUTES, end: now}, - zoom: {min: FIFTY_YEARS, max: ONE_MINUTE} - }; - } - return this.defaultValues; + return { + key: 'utc-default', + name: 'UTC time system defaults', + deltas: {start: FIFTEEN_MINUTES, end: 0}, + bounds: {start: now - FIFTEEN_MINUTES, end: now}, + zoom: {min: FIFTY_YEARS, max: ONE_MINUTE} + }; }; return UTCTimeSystem; diff --git a/src/plugins/plugins.js b/src/plugins/plugins.js index 428a7015a5..785c72cd52 100644 --- a/src/plugins/plugins.js +++ b/src/plugins/plugins.js @@ -68,14 +68,6 @@ define([ return ts.metadata.key === options.defaultTimeSystem; }); if (timeSystem !== undefined) { - defaults = timeSystem.defaults(); - - if (options.defaultTimespan !== undefined) { - defaults.deltas.start = options.defaultTimespan; - defaults.bounds.start = defaults.bounds.end - options.defaultTimespan; - timeSystem.defaults(defaults); - } - openmct.conductor.timeSystem(timeSystem, defaults.bounds); } }