mirror of
https://github.com/nasa/openmct.git
synced 2025-05-03 09:12:51 +00:00
Merge in latest from master into topic branch for nasa/openmctweb#115 Conflicts: platform/features/conductor/src/ConductorRepresenter.js platform/features/conductor/src/ConductorTelemetrySeries.js platform/features/conductor/src/TimeConductor.js platform/features/conductor/test/ConductorRepresenterSpec.js platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
Directives
mct-scroll-x
is an attribute whose value is an assignable Angular expression. This two-way binds that expression to the horizontal scroll state of the element on which it is applied.mct-scroll-y
is an attribute whose value is an assignable Angular expression. This two-way binds that expression to the vertical scroll state of the element on which it is applied.