Victor Woeltjen d8276c532b Merge remote-tracking branch 'github/master' into open115b
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
2015-10-09 10:04:15 -07:00
..
2015-10-02 15:44:36 -07:00

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.