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

more lint fixes

Browse Source
This commit is contained in:
Jamie Vigliotta 2020-08-14 10:46:56 -07:00
parent 33c37ebf19
commit 6e0c1cc674
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/displayLayout/DisplayLayoutToolbar.js
View File

@ -523,16 +523,10 @@ define(['lodash'], function (_) {
function getToggleUnitsButton(selectedParent, selection) {
let applicableItems = getAllOfType(selection, 'telemetry-view');
applicableItems = unitsOnly(applicableItems);
<<<<<<< HEAD
if(!applicableItems.length) {
return;
}
=======
if (!applicableItems.length) {
return;
}
>>>>>>> master
return {
control: "toggle-button",
domainObject: selectedParent,
@ -558,28 +552,19 @@ define(['lodash'], function (_) {
function unitsOnly(items) {
let results = items.filter((item) => {
let currentItem = item[0];
<<<<<<< HEAD
let metadata = this.openmct.telemetry.getMetadata(currentItem.context.item);
=======
let metadata = openmct.telemetry.getMetadata(currentItem.context.item);
if (!metadata) {
return false;
}
>>>>>>> master
let hasUnits = metadata
.valueMetadatas
.filter((metadatum) => metadatum.unit)
.length;
<<<<<<< HEAD
return hasUnits > 0;
});
=======
return hasUnits > 0;
});
>>>>>>> master
return results;
}
@ -737,16 +722,10 @@ define(['lodash'], function (_) {
if (toolbar.viewSwitcher.length === 0) {
toolbar.viewSwitcher = [getViewSwitcherMenu(selectedParent, selectionPath, selectedObjects)];
}
<<<<<<< HEAD
if (toolbar['unit-toggle'].length === 0) {
let toggleUnitsButton = getToggleUnitsButton(selectedParent, selectedObjects);
if(toggleUnitsButton) {
=======
if (toolbar['unit-toggle'].length === 0) {
let toggleUnitsButton = getToggleUnitsButton(selectedParent, selectedObjects);
if (toggleUnitsButton) {
>>>>>>> master
toolbar['unit-toggle'] = [toggleUnitsButton];
}
}