Merge pull request #1443 from nasa/remove-old-bundle-loading

Stop loading bundles.json
This commit is contained in:
Andrew Henry 2017-02-21 16:32:26 -08:00 committed by GitHub
commit 4b905fa7d2
3 changed files with 3 additions and 4 deletions

View File

@ -25,7 +25,6 @@
*/
define({
MODULE_NAME: "OpenMCTWeb",
BUNDLE_LISTING_FILE: "bundles.json",
BUNDLE_FILE: "bundle.json",
SEPARATOR: "/",
EXTENSION_SUFFIX: "[]",

View File

@ -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));

View File

@ -98,7 +98,7 @@ define([
// Initialize the application
$log.info("Initializing application.");
initializer.runApplication(Constants.BUNDLE_LISTING_FILE);
initializer.runApplication();
};
return FrameworkLayer;