diff --git a/app.js b/app.js index 4ebc9c3e94..12ef392ab3 100644 --- a/app.js +++ b/app.js @@ -14,8 +14,7 @@ options = require('minimist')(process.argv.slice(2)), express = require('express'), app = express(), - fs = require('fs'), - bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8')); + fs = require('fs'); // Defaults options.port = options.port || options.p || 8080; @@ -40,17 +39,19 @@ process.exit(0); } - // Handle command line inclusions/exclusions - bundles = bundles.concat(options.include); - bundles = bundles.filter(function (bundle) { - return options.exclude.indexOf(bundle) === -1; - }); - bundles = bundles.filter(function (bundle, index) { // Uniquify - return bundles.indexOf(bundle) === index; - }); - // Override bundles.json for HTTP requests app.use('/' + BUNDLE_FILE, function (req, res) { + var bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8')); + + // Handle command line inclusions/exclusions + bundles = bundles.concat(options.include); + bundles = bundles.filter(function (bundle) { + return options.exclude.indexOf(bundle) === -1; + }); + bundles = bundles.filter(function (bundle, index) { // Uniquify + return bundles.indexOf(bundle) === index; + }); + res.send(JSON.stringify(bundles)); }); diff --git a/platform/features/imagery/src/directives/MCTBackgroundImage.js b/platform/features/imagery/src/directives/MCTBackgroundImage.js index 0e5c20e919..3218910db5 100644 --- a/platform/features/imagery/src/directives/MCTBackgroundImage.js +++ b/platform/features/imagery/src/directives/MCTBackgroundImage.js @@ -64,7 +64,7 @@ define( if (!url) { loaded = myCounter; - element.css('background-image', undefined); + element.css('background-image', 'none'); } else { image = $document[0].createElement('img'); image.src = url; diff --git a/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js b/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js index 3c55f6f480..2444266619 100644 --- a/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js +++ b/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js @@ -92,7 +92,7 @@ define( expect(mockElement.css.mostRecentCall.args).toEqual([ "background-image", - undefined + "none" ]); }); }); diff --git a/pom.xml b/pom.xml index 194594d6e6..72779efb65 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd open-mct-web Open MCT Web - 0.7.1-SNAPSHOT + 0.7.2-SNAPSHOT war