Merge branch 'master' into new-folder-action

src/plugins/LADTable/LADTableCompositionPolicy.js

@@ -20,20 +20,13 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-export default class LADTableCompositionPolicy {
+export default function ladTableCompositionPolicy(openmct) {
-
+    return function (parent, child) {
-    constructor(openmct) {
-        this.openmct = openmct;
-        return this.allow.bind(this);
-    }
-
-    allow(parent, child) {
         if(parent.type === 'LadTable') {
-            return this.openmct.telemetry.isTelemetryObject(child);
+            return openmct.telemetry.isTelemetryObject(child);
         } else if(parent.type === 'LadTableSet') {
             return child.type === 'LadTable';
         }
-
         return true;
     }
 }

src/plugins/LADTable/plugin.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 import LADTableViewProvider from './LADTableViewProvider';
 import LADTableSetViewProvider from './LADTableSetViewProvider';
-import LADTableCompositionPolicy from './LADTableCompositionPolicy';
+import ladTableCompositionPolicy from './LADTableCompositionPolicy';
 
 export default function plugin() {
     return function install(openmct) {
@@ -49,6 +49,6 @@ export default function plugin() {
             }
         });
 
-        openmct.composition.addPolicy(new LADTableCompositionPolicy(openmct));
+        openmct.composition.addPolicy(ladTableCompositionPolicy(openmct));
     };
 }

src/plugins/plot/src/chart/MCTChartController.js

@@ -30,8 +30,7 @@ define([
     './MCTChartPointSet',
     './MCTChartAlarmPointSet',
     '../draw/DrawLoader',
-    '../lib/eventHelpers',
+    '../lib/eventHelpers'
-    'lodash'
 ],
 function (
     MCTChartLineLinear,
@@ -39,8 +38,7 @@ function (
     MCTChartPointSet,
     MCTChartAlarmPointSet,
     DrawLoader,
-    eventHelpers,
+    eventHelpers
-    _
 ) {
 
     var MARKER_SIZE = 6.0,

src/plugins/plot/src/configuration/Collection.js

@@ -22,13 +22,11 @@
 /*global define*/
 
 define([
-    'lodash',
     'EventEmitter',
     './Model',
     '../lib/extend',
     '../lib/eventHelpers'
 ], function (
-    _,
     EventEmitter,
     Model,
     extend,

src/plugins/plot/src/draw/Draw2D.js

@@ -22,11 +22,9 @@
 
 
 define([
-    'lodash',
     'EventEmitter',
     '../lib/eventHelpers'
 ], function (
-    _,
     EventEmitter,
     eventHelpers
 ) {

src/plugins/plot/src/draw/DrawWebGL.js

@@ -22,11 +22,9 @@
 
 
 define([
-    'lodash',
     'EventEmitter',
     '../lib/eventHelpers'
 ], function (
-    _,
     EventEmitter,
     eventHelpers
 ) {

src/plugins/plot/src/inspector/PlotOptionsController.js

@@ -23,13 +23,11 @@
 define([
     '../configuration/configStore',
     '../lib/eventHelpers',
-    'objectUtils',
+    'objectUtils'
-    'lodash'
 ], function (
     configStore,
     eventHelpers,
-    objectUtils,
+    objectUtils
-    _
 ) {
 
     function PlotOptionsController($scope, openmct, $timeout) {

src/plugins/plot/src/inspector/PlotYAxisFormController.js

@@ -21,11 +21,9 @@
  *****************************************************************************/
 
 define([
-    './PlotModelFormController',
+    './PlotModelFormController'
-    'lodash'
 ], function (
-    PlotModelFormController,
+    PlotModelFormController
-    _
 ) {
 
     var PlotYAxisFormController = PlotModelFormController.extend({

src/plugins/plot/src/telemetry/StackedPlotController.js

@@ -20,12 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([
+define([], function () {
-    'lodash'
-], function (
-    _
-) {
-
     function StackedPlotController($scope, openmct, objectService, $element, exportImageService) {
         var tickWidth = 0,
             composition,
@@ -125,12 +120,13 @@ define([
         $scope.$watch('domainObject.getModel().composition', onCompositionChange);
 
         $scope.$on('plot:tickWidth', function ($e, width) {
-            var plotId = $e.targetScope.domainObject.getId();
+            const plotId = $e.targetScope.domainObject.getId();
             if (!tickWidthMap.hasOwnProperty(plotId)) {
                 return;
             }
+
             tickWidthMap[plotId] = Math.max(width, tickWidthMap[plotId]);
-            var newTickWidth = _.max(tickWidthMap);
+            const newTickWidth = Math.max(...Object.values(tickWidthMap));
             if (newTickWidth !== tickWidth || width !== tickWidth) {
                 tickWidth = newTickWidth;
                 $scope.$broadcast('plot:tickWidth', tickWidth);