diff --git a/example/localTimeSystem/src/LADTickSource.js b/example/localTimeSystem/src/LADTickSource.js index ba3fb9d5318..35fff32f547 100644 --- a/example/localTimeSystem/src/LADTickSource.js +++ b/example/localTimeSystem/src/LADTickSource.js @@ -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', diff --git a/example/localTimeSystem/src/LocalTimeSystem.js b/example/localTimeSystem/src/LocalTimeSystem.js index 2ffd61fc0ff..95485b7e69d 100644 --- a/example/localTimeSystem/src/LocalTimeSystem.js +++ b/example/localTimeSystem/src/LocalTimeSystem.js @@ -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) { diff --git a/main.js b/main.js index 078c50f5385..7e91564ebd2 100644 --- a/main.js +++ b/main.js @@ -91,10 +91,14 @@ define([ './platform/features/pages/bundle', './platform/features/plot/bundle', './platform/features/timeline/bundle', + + // Old time conductor //'./platform/features/conductor/bundle', - './platform/features/conductor-v2/conductor/bundle', - './platform/features/conductor-v2/compatibility/bundle', - './platform/features/conductor-v2/utcTimeSystem/bundle', + + // New time conductor + //'./platform/features/conductor-v2/conductor/bundle', + //'./platform/features/conductor-v2/compatibility/bundle', + //'./platform/features/conductor-v2/utcTimeSystem/bundle', './platform/features/table/bundle', './platform/forms/bundle', './platform/identity/bundle', @@ -106,7 +110,7 @@ define([ './platform/search/bundle', './platform/status/bundle', './platform/commonUI/regions/bundle' - //'./example/localTimeSystem/bundle' + ], function (Main, legacyRegistry) { return { diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 4f10dd90987..f431003e476 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -59,9 +59,5 @@ - - + diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 12c8d45ebfc..54cc0a2cdd5 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -116,6 +116,7 @@ $colorProgressBarAmt: $colorKey; $progressBarHOverlay: 15px; $progressBarStripeW: 20px; $shdwStatusIc: rgba(black, 0.4) 0 1px 2px; +$animPausedPulseDur: 500ms; // Selects $colorSelectBg: $colorBtnBg; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index f119559ba61..99dace8787e 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -116,6 +116,7 @@ $colorProgressBarAmt: #0a0; $progressBarHOverlay: 15px; $progressBarStripeW: 20px; $shdwStatusIc: rgba(white, 0.8) 0 0px 5px; +$animPausedPulseDur: 1s; // Selects $colorSelectBg: $colorBtnBg; diff --git a/platform/features/conductor-v2/conductor/bundle.js b/platform/features/conductor-v2/conductor/bundle.js index 2dff5d8c6fb..438cb33715d 100644 --- a/platform/features/conductor-v2/conductor/bundle.js +++ b/platform/features/conductor-v2/conductor/bundle.js @@ -93,22 +93,22 @@ define([ ], "templates": [ { - "key": "time-conductor", + "key": "conductor", "template": timeConductorTemplate - } - ], - "representations": [ + }, { - "key": "time-conductor", - "template": timeConductorTemplate + "key": "mode-menu", + "template": modeMenuTemplate }, { "key": "mode-selector", "template": modeSelectorTemplate - }, + } + ], + "representations": [ { - "key": "mode-menu", - "template": modeMenuTemplate + "key": "time-conductor", + "template": timeConductorTemplate } ], "formats": [ diff --git a/platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss b/platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss index 6de6bf3e086..e20c0ef4cd4 100644 --- a/platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss +++ b/platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss @@ -233,7 +233,7 @@ // Real-time, latest modes &.realtime-mode, - &.latest-mode { + &.lad-mode { .time-conductor-icon { &:before { color: $colorTimeCondKeyBg; } div[class*="hand"] { @@ -318,7 +318,7 @@ } // LAD mode - &.latest-mode { + &.lad-mode { $i: $glyph-icon-database; .time-conductor-icon div[class*="hand"] { @include animation-name(clock-hands-sticky); @@ -411,7 +411,7 @@ // Real-time, latest modes &.realtime-mode, - &.latest-mode { + &.lad-mode { .l-time-conductor-inputs-and-ticks { .l-time-range-w { &.start-w { diff --git a/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-menu.html b/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-menu.html index d2d4c6af900..990c6de4824 100644 --- a/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-menu.html +++ b/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-menu.html @@ -24,8 +24,8 @@ diff --git a/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-selector.html b/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-selector.html index a3e122ca34f..1f346f2bef6 100644 --- a/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-selector.html +++ b/platform/features/conductor-v2/conductor/res/templates/mode-selector/mode-selector.html @@ -27,9 +27,8 @@ \ No newline at end of file diff --git a/platform/features/conductor-v2/conductor/res/templates/time-conductor.html b/platform/features/conductor-v2/conductor/res/templates/time-conductor.html index 39b96c8c954..19c86b2b746 100644 --- a/platform/features/conductor-v2/conductor/res/templates/time-conductor.html +++ b/platform/features/conductor-v2/conductor/res/templates/time-conductor.html @@ -83,12 +83,11 @@
- - + 0) { + if (timeSystemsForMode('lad').length > 0) { var ladMode = { - key: 'LAD', + key: 'lad', cssclass: 'icon-database', label: 'LAD', name: 'LAD Mode', diff --git a/platform/features/conductor-v2/conductor/src/ui/TimeConductorViewServiceSpec.js b/platform/features/conductor-v2/conductor/src/ui/TimeConductorViewServiceSpec.js index 62ad29de9bc..39e7810320f 100644 --- a/platform/features/conductor-v2/conductor/src/ui/TimeConductorViewServiceSpec.js +++ b/platform/features/conductor-v2/conductor/src/ui/TimeConductorViewServiceSpec.js @@ -112,7 +112,7 @@ define(['./TimeConductorViewService'], function (TimeConductorViewService) { var mockTimeSystems = [mockConstructor(tickingTimeSystem)]; var mockLADTickSource = { metadata: { - mode: 'LAD' + mode: 'lad' } }; tickingTimeSystem.tickSources.andReturn([mockLADTickSource]); @@ -120,7 +120,7 @@ define(['./TimeConductorViewService'], function (TimeConductorViewService) { viewService = new TimeConductorViewService(mockTimeConductor, mockTimeSystems); var availableModes = viewService.availableModes(); - expect(availableModes.LAD).toBeDefined(); + expect(availableModes.lad).toBeDefined(); }); describe("when mode is changed", function () {