diff --git a/platform/framework/src/FrameworkLayer.js b/platform/framework/src/FrameworkLayer.js index c8e5519e38..bd85804f4c 100644 --- a/platform/framework/src/FrameworkLayer.js +++ b/platform/framework/src/FrameworkLayer.js @@ -55,13 +55,13 @@ define([ FrameworkLayer.prototype.initializeApplication = function ( angular, - legacyRegistry, + openmct, logLevel ) { var $http = this.$http, $log = this.$log, app = angular.module(Constants.MODULE_NAME, ["ngRoute"]), - loader = new BundleLoader($http, $log, legacyRegistry), + loader = new BundleLoader($http, $log, openmct.legacyRegistry), resolver = new BundleResolver( new ExtensionResolver( new ImplementationLoader({}), @@ -77,7 +77,7 @@ define([ ), bootstrapper = new ApplicationBootstrapper( angular, - window.document, + openmct.element, $log ), initializer = new FrameworkInitializer( diff --git a/platform/framework/src/Main.js b/platform/framework/src/Main.js index 75a3c85a89..cf67461ebb 100644 --- a/platform/framework/src/Main.js +++ b/platform/framework/src/Main.js @@ -41,7 +41,7 @@ define( function Main() { } - Main.prototype.run = function (legacyRegistry) { + Main.prototype.run = function (openmct) { // Get a reference to Angular's injector, so we can get $http and $log // services, which are useful to the framework layer. var injector = angular.injector(['ng']); @@ -53,7 +53,7 @@ define( } return injector.instantiate(['$http', '$log', FrameworkLayer]) - .initializeApplication(angular, legacyRegistry, logLevel()); + .initializeApplication(angular, openmct, logLevel()); }; return Main; diff --git a/platform/import-export/bundle.js b/platform/import-export/bundle.js index 7c0ba82b57..a206ca8187 100644 --- a/platform/import-export/bundle.js +++ b/platform/import-export/bundle.js @@ -72,7 +72,6 @@ define([ ] } }); - openmct.legacyRegistry.enable('platform/import-export'); }; }; }); diff --git a/src/MCT.js b/src/MCT.js index 574757071d..b560849a5d 100644 --- a/src/MCT.js +++ b/src/MCT.js @@ -344,6 +344,8 @@ define([ domElement = document.body; } + this.element = domElement; + this.legacyExtension('runs', { depends: ['navigationService'], implementation: function (navigationService) { @@ -373,7 +375,7 @@ define([ * @event start * @memberof module:openmct.MCT~ */ - var startPromise = new Main().run(this.legacyRegistry) + var startPromise = new Main().run(this) .then(function (angular) { this.$angular = angular; // OpenMCT Object provider doesn't operate properly unless diff --git a/src/adapter/policies/LegacyCompositionPolicyAdapter.js b/src/adapter/policies/LegacyCompositionPolicyAdapter.js index 350eb8a346..343c9e978f 100644 --- a/src/adapter/policies/LegacyCompositionPolicyAdapter.js +++ b/src/adapter/policies/LegacyCompositionPolicyAdapter.js @@ -21,13 +21,13 @@ *****************************************************************************/ export default function legacyCompositionPolicyAdapter(openmct) { - const instantiate = this.openmct.$injector.get('instantiate'); - const policyService = this.openmct.$injector.get('policyService'); + const instantiate = openmct.$injector.get('instantiate'); + const policyService = openmct.$injector.get('policyService'); openmct.composition.addPolicy((parent, child) => { - let parentId = this.openmct.objects.makeKeyString(parent.identifier); - let childId = this.openmct.objects.makeKeyString(child.identifier); + let parentId = openmct.objects.makeKeyString(parent.identifier); + let childId = openmct.objects.makeKeyString(child.identifier); let legacyParent = instantiate(parent, parentId); let legacyChild = instantiate(child, childId); diff --git a/src/ui/layout/CreateButton.vue b/src/ui/layout/CreateButton.vue index edcab956b3..57f6edd0e4 100644 --- a/src/ui/layout/CreateButton.vue +++ b/src/ui/layout/CreateButton.vue @@ -96,10 +96,10 @@ // 2. Get legacy type from legacy api // 3. Instantiate create action with type, parent, context // 4. perform action. - return this.openmct.objects.get(openmct.router.path[0].identifier) + return this.openmct.objects.get(this.openmct.router.path[0].identifier) .then((currentObject) => { let legacyContextualParent = this.convertToLegacy(currentObject); - let legacyType = openmct.$injector.get('typeService').getType(item.key); + let legacyType = this.openmct.$injector.get('typeService').getType(item.key); let context = { key: "create", domainObject: legacyContextualParent // should be same as parent object. @@ -116,7 +116,7 @@ convertToLegacy (domainObject) { let keyString = objectUtils.makeKeyString(domainObject.identifier); let oldModel = objectUtils.toOldFormat(domainObject); - return openmct.$injector.get('instantiate')(oldModel, keyString); + return this.openmct.$injector.get('instantiate')(oldModel, keyString); } }, destroyed () { @@ -126,7 +126,7 @@ let items = []; this.openmct.types.listKeys().forEach(key => { - let menuItem = openmct.types.get(key).definition; + let menuItem = this.openmct.types.get(key).definition; if (menuItem.creatable) { let menuItemTemplate = { diff --git a/src/ui/layout/status-bar/NotificationBanner.vue b/src/ui/layout/status-bar/NotificationBanner.vue index 9050df78d4..9a2b06f12f 100644 --- a/src/ui/layout/status-bar/NotificationBanner.vue +++ b/src/ui/layout/status-bar/NotificationBanner.vue @@ -235,7 +235,7 @@ } }, mounted() { - openmct.notifications.on('notification', this.showNotification); + this.openmct.notifications.on('notification', this.showNotification); } }