File tree 4 files changed +22
-2
lines changed
example/localTimeSystem/src
platform/features/conductor-v2
4 files changed +22
-2
lines changed Original file line number Diff line number Diff line change @@ -70,6 +70,14 @@ define([
70
70
{
71
71
key : 'local-default' ,
72
72
name : 'Local 12 hour time system defaults' ,
73
+ mode : 'fixed' ,
74
+ deltas : { start : FIFTEEN_MINUTES , end : 0 } ,
75
+ bounds : { start : now - FIFTEEN_MINUTES , end : now }
76
+ } ,
77
+ {
78
+ key : 'local-default' ,
79
+ name : 'Local 12 hour time system defaults' ,
80
+ mode : 'follow' ,
73
81
deltas : { start : FIFTEEN_MINUTES , end : 0 } ,
74
82
bounds : { start : now - FIFTEEN_MINUTES , end : now }
75
83
}
Original file line number Diff line number Diff line change @@ -53,7 +53,9 @@ define(
53
53
TimeConductorMode . prototype . selectedTimeSystem . apply ( this , arguments ) ;
54
54
55
55
if ( timeSystem ) {
56
- var defaults = timeSystem . defaults ( ) [ 0 ] ;
56
+ var defaults = timeSystem . defaults ( ) . filter ( function ( d ) {
57
+ return d . mode === 'fixed' ;
58
+ } ) [ 0 ] ;
57
59
58
60
var bounds = {
59
61
start : defaults . bounds . start ,
Original file line number Diff line number Diff line change @@ -87,7 +87,9 @@ define(
87
87
this . tickSourceUnlisten ( ) ;
88
88
}
89
89
90
- var defaults = timeSystem . defaults ( ) [ 0 ] ;
90
+ var defaults = timeSystem . defaults ( ) . filter ( function ( d ) {
91
+ return d . mode === 'follow' ;
92
+ } ) [ 0 ] ;
91
93
92
94
if ( arguments . length > 0 ) {
93
95
var bounds = {
Original file line number Diff line number Diff line change @@ -70,6 +70,14 @@ define([
70
70
{
71
71
key : 'utc-default' ,
72
72
name : 'UTC time system defaults' ,
73
+ mode : 'follow' ,
74
+ deltas : { start : FIFTEEN_MINUTES , end : 0 } ,
75
+ bounds : { start : now - FIFTEEN_MINUTES , end : now }
76
+ } ,
77
+ {
78
+ key : 'utc-default' ,
79
+ name : 'UTC time system defaults' ,
80
+ mode : 'fixed' ,
73
81
deltas : { start : FIFTEEN_MINUTES , end : 0 } ,
74
82
bounds : { start : now - FIFTEEN_MINUTES , end : now }
75
83
}
You can’t perform that action at this time.
0 commit comments