ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 21:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Time Conductor] Remove checks for undefined domain

Browse Source 
Per code review, nasa/openmctweb#204
This commit is contained in:
Victor Woeltjen 2015-10-30 13:04:29 -07:00
parent b6d08726fb
commit 101e3bb346
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/features/conductor/src/ConductorRepresenter.js
View File

@ -78,11 +78,10 @@ define(
// Combine start/end times into a single object // Combine start/end times into a single object
function bounds() { function bounds() {
var domain = conductor.domain();
return { return {
start: conductor.displayStart(), start: conductor.displayStart(),
end: conductor.displayEnd(), end: conductor.displayEnd(),
domain: domain && domain.key domain: conductor.domain().key
}; };
} }
@ -132,7 +131,7 @@ define(
{ outer: bounds(), inner: bounds() }; { outer: bounds(), inner: bounds() };
conductorScope.ngModel.options = conductorScope.ngModel.options =
conductor.domainOptions().map(makeOption); conductor.domainOptions().map(makeOption);
conductorScope.ngModel.domain = (conductor.domain() || {}).key; conductorScope.ngModel.domain = conductor.domain().key;
conductorScope.parameters = {}; conductorScope.parameters = {};
conductorScope conductorScope

2
platform/features/conductor/src/ConductorTelemetryDecorator.js
View File

@ -51,7 +51,7 @@ define(
request = request || {}; request = request || {};
request.start = start; request.start = start;
request.end = end; request.end = end;
request.domain = domain && domain.key; request.domain = domain.key;
return request; return request;
} }