ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'open1182' into open1193

Browse Source
This commit is contained in:
Henry 2016-10-11 13:26:20 -07:00
commit 938bf3c4df
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/features/conductor-v2/conductor/src/ui/TimeConductorMode.js
View File

@ -176,11 +176,12 @@ define(
* @returns {TimeSystemDeltas} * @returns {TimeSystemDeltas}
*/ */
TimeConductorMode.prototype.deltas = function (deltas) { TimeConductorMode.prototype.deltas = function (deltas) {
if (arguments.length !== 0 && this.metadata().key!=='fixed') { if (arguments.length !== 0) {
var bounds = this.calculateBoundsFromDeltas(deltas); var bounds = this.calculateBoundsFromDeltas(deltas);
this.dlts = deltas; this.dlts = deltas;
this.conductor.bounds(bounds); if (this.metadata().key!=='fixed') {
this.conductor.bounds(bounds);
}
} }
return this.dlts; return this.dlts;
}; };