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

2
example/localTimeSystem/src/LADTickSource.js
View File

@ -30,7 +30,7 @@ define(['../../../platform/features/conductor-v2/conductor/src/timeSystems/Local
this.metadata = {
key: 'test-lad',
mode: 'LAD',
mode: 'lad',
cssclass: 'icon-clock',
label: 'Latest Available Data',
name: 'Latest available data',

12
example/localTimeSystem/src/LocalTimeSystem.js
View File

@ -25,9 +25,7 @@ define([
'../../../platform/features/conductor-v2/conductor/src/timeSystems/LocalClock',
'./LADTickSource'
], function (TimeSystem, LocalClock, LADTickSource) {
var FIFTEEN_MINUTES = 15 * 60 * 1000,
THIRTY_MINUTES = 30 * 60 * 1000,
ONE_HOUR = 60 * 60 * 1000,
var THIRTY_MINUTES = 30 * 60 * 1000,
DEFAULT_PERIOD = 1000;
/**
@ -49,14 +47,14 @@ define([
'glyph': '\u0043'
};
this._formats = ['local-format'];
this._tickSources = [new LocalClock($timeout, DEFAULT_PERIOD), new LADTickSource($timeout, DEFAULT_PERIOD)];
this.fmts = ['local-format'];
this.sources = [new LocalClock($timeout, DEFAULT_PERIOD), new LADTickSource($timeout, DEFAULT_PERIOD)];
}
LocalTimeSystem.prototype = Object.create(TimeSystem.prototype);
LocalTimeSystem.prototype.formats = function () {
return this._formats;
return this.fmts;
};
LocalTimeSystem.prototype.deltaFormat = function () {
@ -64,7 +62,7 @@ define([
};
LocalTimeSystem.prototype.tickSources = function () {
return this._tickSources;
return this.sources;
};
LocalTimeSystem.prototype.defaults = function (key) {