From af9ffaf02dedf95fc80dee1c713592723cf36390 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Wed, 15 Feb 2017 10:51:36 -0800 Subject: [PATCH] Stop loading bundles.json Stop application from requesting bundles.json at first load. This was confusing to some external developers who would see an error in the log and not know the cause. --- platform/framework/src/Constants.js | 1 - platform/framework/src/FrameworkInitializer.js | 4 ++-- platform/framework/src/FrameworkLayer.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/framework/src/Constants.js b/platform/framework/src/Constants.js index 663fde6d72..0ba19f4cd8 100644 --- a/platform/framework/src/Constants.js +++ b/platform/framework/src/Constants.js @@ -25,7 +25,6 @@ */ define({ MODULE_NAME: "OpenMCTWeb", - BUNDLE_LISTING_FILE: "bundles.json", BUNDLE_FILE: "bundle.json", SEPARATOR: "/", EXTENSION_SUFFIX: "[]", diff --git a/platform/framework/src/FrameworkInitializer.js b/platform/framework/src/FrameworkInitializer.js index cea0a6ddb7..4a56998b61 100644 --- a/platform/framework/src/FrameworkInitializer.js +++ b/platform/framework/src/FrameworkInitializer.js @@ -61,8 +61,8 @@ define( * @param bundleList * @returns {*} */ - FrameworkInitializer.prototype.runApplication = function (bundleList) { - return this.loader.loadBundles(bundleList) + FrameworkInitializer.prototype.runApplication = function () { + return this.loader.loadBundles([]) .then(bind(this.resolver.resolveBundles, this.resolver)) .then(bind(this.registrar.registerExtensions, this.registrar)) .then(bind(this.bootstrapper.bootstrap, this.bootstrapper)); diff --git a/platform/framework/src/FrameworkLayer.js b/platform/framework/src/FrameworkLayer.js index 067bf763bc..e84b1e29e0 100644 --- a/platform/framework/src/FrameworkLayer.js +++ b/platform/framework/src/FrameworkLayer.js @@ -98,7 +98,7 @@ define([ // Initialize the application $log.info("Initializing application."); - initializer.runApplication(Constants.BUNDLE_LISTING_FILE); + initializer.runApplication(); }; return FrameworkLayer;