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

Removed redundant undefined check, and renamed allTimeSystems to getAllTimeSystems

Browse Source
This commit is contained in:
Henry 2017-04-28 16:27:07 -07:00
parent f17417a541
commit 52b6815687
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/features/conductor/core/src/ui/TimeConductorController.js
View File

@ -144,13 +144,13 @@ define(
TimeConductorController.prototype.getClock = function (key) {
return this.timeAPI.allClocks().filter(function (clock) {
return this.timeAPI.getAllClocks().filter(function (clock) {
return clock.key === key;
})[0];
};
TimeConductorController.prototype.getTimeSystem = function (key) {
return this.timeAPI.allTimeSystems().filter(function (timeSystem) {
return this.timeAPI.getAllTimeSystems().filter(function (timeSystem) {
return timeSystem.key === key;
})[0];
};

4
src/api/time/TimeAPI.js
View File

@ -83,7 +83,7 @@ define(['EventEmitter'], function (EventEmitter) {
this.timeSystems.set(timeSystem.key, timeSystem);
};
TimeAPI.prototype.allTimeSystems = function () {
TimeAPI.prototype.getAllTimeSystems = function () {
return Array.from(this.timeSystems.values());
};
@ -91,7 +91,7 @@ define(['EventEmitter'], function (EventEmitter) {
this.clocks.set(clock.key, clock);
};
TimeAPI.prototype.allClocks = function () {
TimeAPI.prototype.getAllClocks = function () {
return Array.from(this.clocks.values());
};

4
src/plugins/timeConductor/plugin.js
View File

@ -34,7 +34,7 @@ define([], function () {
return function (openmct) {
function getTimeSystem(key) {
return openmct.time.allTimeSystems().filter(function (timeSystem) {
return openmct.time.getAllTimeSystems().filter(function (timeSystem) {
return timeSystem.key === key;
})[0];
}
@ -68,7 +68,7 @@ define([], function () {
}
var configForTimeSystem = config.menuOptions.filter(function (menuOption) {
return menuOption.timeSystem === (timeSystem && timeSystem.key) && menuOption.clock === (clock && clock.key);
return menuOption.timeSystem === timeSystem.key && menuOption.clock === (clock && clock.key);
})[0];
if (configForTimeSystem !== undefined) {