ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Time Conductor] Fix merge issues

Browse Source 
Fix merge issues not addressed during conflict resolution.
This commit is contained in:
Victor Woeltjen 2015-10-09 11:06:41 -07:00
parent 1efa97e6f5
commit 28c42fcd4c
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/src/ConductorRepresenter.js
View File

@ -28,7 +28,7 @@ define(
var CONDUCTOR_HEIGHT = "100px",
TEMPLATE = [
"<mct-include key=\"'time-conductor'\" ng-model='conductor'>",
"<mct-include key=\"'time-conductor'\" ng-model='ngModel'>",
"</mct-include>"
].join(''),
THROTTLE_MS = 200,
@ -90,8 +90,9 @@ define(
}
function updateConductorInner() {
conductor.displayStart(conductorScope.conductor.inner.start);
conductor.displayEnd(conductorScope.conductor.inner.end);
var innerBounds = conductorScope.ngModel.conductor.inner;
conductor.displayStart(innerBounds.start);
conductor.displayEnd(innerBounds.end);
lastObservedBounds = lastObservedBounds || bounds();
broadcastBounds();
}